EAPI=6 for psi plugins + some fixes to Psi

eclass/psiplus-plugin.eclass

@@ -8,7 +8,7 @@
 # @BLURB: This eclass provides functions for build all plugin to net-im/psi
 # package
 # @DESCRIPTION:
-# This eclass provides functions build all plugin tonet-im/psi
+# This eclass provides functions build all plugin to net-im/psi
 # Original Author: Rion <rion4ik@gmail.com>
 # Purpose:
 
@@ -27,14 +27,13 @@ MY_PN="${PN#psi-}plugin"
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-2"
+	SCM="git-r3"
 	PLUGIN_DIR="${PLUGIN_DIR:-generic}"
 	EGIT_REPO_URI="git://github.com/psi-plus/plugins.git"
-	EGIT_PROJECT="psi-plus/plugins"
-	EGIT_SOURCEDIR="${WORKDIR}/plugins"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/plugins"
 fi
 
-inherit qt4-r2 ${SCM}
+inherit qmake-utils ${SCM}
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
@@ -57,16 +56,27 @@ DEPEND=">=net-im/psi-9999[extras,plugins]"
 RDEPEND="${DEPEND}"
 
 # Eclass exported functions
-EXPORT_FUNCTIONS src_prepare src_configure
+EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_install
+
+psiplus-plugin_src_unpack() {
+	if [ -n "$SCM" ]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
 
 psiplus-plugin_src_prepare() {
-	qt4-r2_src_prepare
-
+	default
 	sed -e 's#\.\./\.\./psiplugin.pri#/usr/share/psi-plus/plugins/psiplugin.pri#' \
-		-i "${MY_PN}".pro || die
+               -i "${MY_PN}".pro || die
 }
 
 psiplus-plugin_src_configure() {
 	use qt4 && eqmake4 "${MY_PN}".pro
 	use qt5 && eqmake5 "${MY_PN}".pro
 }
+
+psiplus-plugin_src_install() {
+	emake install INSTALL_ROOT="${D}"
+}

net-im/psi-attention/psi-attention-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-autoreply/psi-autoreply-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-birthdayreminder/psi-birthdayreminder-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-captchaforms/psi-captchaforms-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-chess/psi-chess-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-cleaner/psi-cleaner-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-clientswitcher/psi-clientswitcher-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-conferencelogger/psi-conferencelogger-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-contentdownloader/psi-contentdownloader-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-extendedmenu/psi-extendedmenu-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-extendedoptions/psi-extendedoptions-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-gmailservice/psi-gmailservice-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-gnome3support/psi-gnome3support-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 PLUGIN_DIR="unix"
 inherit psiplus-plugin

net-im/psi-gnupg/psi-gnupg-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 PLUGIN_DIR="generic"
 inherit psiplus-plugin

net-im/psi-gomokugame/psi-gomokugame-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-historykeeper/psi-historykeeper-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-icqdie/psi-icqdie-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-image/psi-image-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-jabberdisk/psi-jabberdisk-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-juick/psi-juick-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-otr/psi-otr-0.9.4.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-otr/psi-otr-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-pepchangenotify/psi-pepchangenotify-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-psto/psi-psto-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 PLUGIN_DIR="dev"
 inherit psiplus-plugin

net-im/psi-qipxstatuses/psi-qipxstatuses-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-screenshot/psi-screenshot-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-skins/psi-skins-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 
@@ -14,17 +14,17 @@ IUSE="+themes"
 RDEPEND="themes? ( !net-im/psi-skins-themes )"
 
 src_unpack() {
-	git-2_src_unpack
+	psiplus-plugin_src_unpack
 
 	if use themes; then
 		EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/resources" \
-		EGIT_SOURCEDIR="${WORKDIR}/resources" \
-		EGIT_REPO_URI="git://github.com/psi-plus/resources.git" git-2_src_unpack
+		EGIT_CHECKOUT_DIR="${WORKDIR}/resources" \
+		EGIT_REPO_URI="git://github.com/psi-plus/resources.git" git-r3_src_unpack
 	fi
 }
 
 src_install() {
-	qt4-r2_src_install
+	psiplus-plugin_src_install
 
 	if use themes; then
 		cd "${WORKDIR}/resources" || die

net-im/psi-stopspam/psi-stopspam-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-storagenotes/psi-storagenotes-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-translate/psi-translate-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-videostatus/psi-videostatus-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-watcher/psi-watcher-9999.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="6"
 
 inherit psiplus-plugin
 

net-im/psi-yandexnarod/ChangeLog

@@ -1,19 +0,0 @@
-# ChangeLog for net-im/psi-yandexnarod
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*psi-yandexnarod-0.1.3_pre5019 (26 Mar 2012)
-
-  26 Mar 2012; Nikoli <nikoli@lavabit.com>
-  +psi-yandexnarod-0.1.3_pre5019.ebuild:
-  version bump
-
-*psi-yandexnarod-0.0.9_pre5012 (05 Nov 2011)
-
-  05 Nov 2011; Nikoli <nikoli@lavabit.com>
-  +psi-yandexnarod-0.0.9_pre5012.ebuild:
-  version bump
-
-  05 Nov 2011; Nikoli <nikoli@lavabit.com> psi-yandexnarod-9999.ebuild:
-  update to EAPI4
-

net-im/psi-yandexnarod/metadata.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>net-im</herd>
-	<maintainer>
-		<email>rion4ik@gmail.com</email>
-		<name>rion</name>
-	</maintainer>
-	<longdescription lang="en">
-	This plugin is port to Psi+ of QutIM plugin. It adds file transfer via narod.yandex.ru feature to Psi+. Also it allows to manage list of files on server.
-	</longdescription>
-</pkgmetadata>

net-im/psi-yandexnarod/psi-yandexnarod-9999.ebuild

@@ -1,12 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit psiplus-plugin
-
-DESCRIPTION="Psi+ plugins for managing files on narod.yandex.ru"
-
-KEYWORDS=""
-IUSE=""

net-im/psi/psi-9999.ebuild

@@ -168,35 +168,32 @@ src_prepare() {
 src_configure() {
 	# unable to use econf because of non-standard configure script
 	# disable growl as it is a MacOS X extension only
-	local myconf="
-		--disable-growl
+
+	CONF=(
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--prefix="${EPREFIX}"/usr
 		--no-separate-debug-info
-	"
-	use dbus || myconf+=" --disable-qdbus"
-	use debug && myconf+=" --debug"
+		--disable-growl
+	)
+
+	use qt4 && CONF+=(--qtdir="$(qt4_get_bindir)/..")
+	use qt5 && CONF+=(--qtdir="$(qt5_get_bindir)/..")
+
+
+	use dbus || CONF+=("--disable-qdbus")
+	use debug && CONF+=("--debug")
 
 	for s in aspell enchant hunspell; do
-		use $s || myconf+=" --disable-$s"
+		use $s || CONF+=("--disable-$s")
 	done
 	
-	use whiteboarding && myconf+=" --enable-whiteboarding"
-	use xscreensaver || myconf+=" --disable-xss"
-	use plugins || myconf+=" --disable-plugins"
-	use webkit && myconf+=" --enable-webkit"
-
-	QTDIR="${EPREFIX}"/usr
-	use qt5 && QTDIR="${EPREFIX}"/usr/$(get_libdir)/qt5
-
-	elog ./configure --prefix="${EPREFIX}"/usr \
-			--qtdir="${QTDIR}" \
-			--libdir=="${EPREFIX}"/usr/$(get_libdir) \
-			${myconf}
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir=="${EPREFIX}"/usr/$(get_libdir) \
-		--qtdir="${QTDIR}" \
-		${myconf} || die
+	use whiteboarding && CONF+=("--enable-whiteboarding")
+	use xscreensaver || CONF+=("--disable-xss")
+	use plugins || CONF+=("--disable-plugins")
+	use webkit && CONF+=("--enable-webkit")
+
+	elog ./configure "${CONF[@]}"
+	./configure "${CONF[@]}"
 
 	use qt4 && eqmake4 psi.pro
 	use qt5 && eqmake5 psi.pro