Sort and cleanup deps. Pin qca dep to =2.0* wrt bug 555526.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

4 files changed, 54 insertions, 37 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 1ab1bfb59757..758acfd6dbf7 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.241 2015/02/22 18:41:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.242 2015/07/22 01:55:42 pesa Exp $
+
+  22 Jul 2015; Davide Pesavento <pesa@gentoo.org> psi-0.14-r4.ebuild,
+  psi-0.15.ebuild, psi-9999.ebuild:
+  Sort and cleanup deps. Pin qca dep to =2.0* wrt bug 555526.
 
   22 Feb 2015; Michał Górny <mgorny@gentoo.org> psi-0.14-r4.ebuild,
   psi-0.15.ebuild, psi-9999.ebuild:
diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild
index 07bf235665d3..8afe57b49ad4 100644
--- a/net-im/psi/psi-0.14-r4.ebuild
+++ b/net-im/psi/psi-0.14-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.18 2015/02/22 18:41:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.19 2015/07/22 01:55:42 pesa Exp $
 
 EAPI=4
 
@@ -30,24 +30,30 @@ for LNG in ${LANGS}; do
 	#SRC_URI="${SRC_URI} http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm"
 done
 
-RDEPEND=">=dev-qt/qtgui-4.4:4[qt3support]
-	>=dev-qt/qt3support-4.4:4
-	>=app-crypt/qca-2.0.2:2[qt4(+)]
-	dbus? ( >=dev-qt/qtdbus-4.4:4 )
+RDEPEND="
+	app-arch/unzip
+	=app-crypt/qca-2.0*[qt4(+)]
+	dev-qt/qt3support:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4[qt3support]
+	>=sys-libs/zlib-1.2.5.1-r2[minizip]
+	dbus? ( dev-qt/qtdbus:4 )
+	extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
 	spell? ( >=app-text/enchant-1.3.0 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
-	extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
-	app-arch/unzip
-	|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )"
-
+"
 DEPEND="${RDEPEND}
 	sys-devel/qconf
-	doc? ( app-doc/doxygen )"
-
-PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
-	jingle? ( net-im/psimedia
-		app-crypt/qca:2[openssl] )
-	ssl? ( app-crypt/qca:2[openssl] )"
+	doc? ( app-doc/doxygen )
+"
+PDEPEND="
+	crypt? ( app-crypt/qca:2[gpg] )
+	jingle? (
+		net-im/psimedia
+		app-crypt/qca:2[openssl]
+	)
+	ssl? ( app-crypt/qca:2[openssl] )
+"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 58a23f0a5ef4..238e63b1e0fc 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.6 2015/02/22 18:41:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.7 2015/07/22 01:55:42 pesa Exp $
 
 EAPI=5
 
@@ -22,25 +22,31 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="crypt dbus debug doc jingle spell ssl xscreensaver whiteboarding"
 RESTRICT="test"
 
-RDEPEND="app-arch/unzip
-	>=dev-qt/qtgui-4.7:4[qt3support]
-	>=dev-qt/qt3support-4.7:4
+RDEPEND="
+	app-arch/unzip
 	>=app-crypt/qca-2.0.2:2[qt4(+)]
+	dev-qt/qt3support:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4[qt3support]
+	>=sys-libs/zlib-1.2.5.1-r2[minizip]
 	x11-libs/libX11
-	dbus? ( >=dev-qt/qtdbus-4.7:4 )
+	dbus? ( dev-qt/qtdbus:4 )
 	spell? ( >=app-text/enchant-1.3.0 )
-	xscreensaver? ( x11-libs/libXScrnSaver )
 	whiteboarding? ( dev-qt/qtsvg:4 )
-	|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )"
-
+	xscreensaver? ( x11-libs/libXScrnSaver )
+"
 DEPEND="${RDEPEND}
 	sys-devel/qconf
-	doc? ( app-doc/doxygen )"
-
-PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
-	jingle? ( net-im/psimedia
-		app-crypt/qca:2[openssl] )
-	ssl? ( app-crypt/qca:2[openssl] )"
+	doc? ( app-doc/doxygen )
+"
+PDEPEND="
+	crypt? ( app-crypt/qca:2[gpg] )
+	jingle? (
+		net-im/psimedia
+		app-crypt/qca:2[openssl]
+	)
+	ssl? ( app-crypt/qca:2[openssl] )
+"
 
 DOC_CONTENTS='Psi+ support(USE="extras") was removed from ebuild since 0.15'
 FORCE_PRINT_ELOG=1
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index e3a9b25509f9..9f64ccb92168 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.23 2015/02/22 18:41:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.24 2015/07/22 01:55:42 pesa Exp $
 
 EAPI="4"
 
@@ -31,19 +31,20 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-qt/qtgui-4.7:4
+	app-arch/unzip
 	>=app-crypt/qca-2.0.2:2[qt4(+)]
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	>=sys-libs/zlib-1.2.5.1-r2[minizip]
 	x11-libs/libX11
-	dbus? ( >=dev-qt/qtdbus-4.7:4 )
-	whiteboarding? ( dev-qt/qtsvg:4 )
+	dbus? ( dev-qt/qtdbus:4 )
+	extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
 	spell? (
 		enchant? ( >=app-text/enchant-1.3.0 )
 		!enchant? ( app-text/aspell )
 	)
+	whiteboarding? ( dev-qt/qtsvg:4 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
-	extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
-	app-arch/unzip
-	|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )
 "
 DEPEND="${RDEPEND}
 	extras? (