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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

5 files changed, 74 insertions, 57 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/Manifest b/net-im/psi/Manifest
index 22216d93ffd4..38c3d4d08518 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -23,27 +23,27 @@ DIST psi-0.15_ur_PK.qm 244903 SHA256 0101370007c9ce735c50dd9bf6dfd8680c5cd562a32
 DIST psi-0.15_zh_TW.qm 171993 SHA256 a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871 WHIRLPOOL 2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344
 DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c SHA512 b6a74fc9b043800040c519504b14bcb5f44864b9115ea167b235a791bafc17c96986ffaf5b6f9ebe4dd3b467b8e472e7c9bf253893e59581a29ad2342b122bfc WHIRLPOOL a030ca57a5f11f46d17a19d8b2f109d043e6b4eed20fbdf406dd71b647a8bb923ecf24f1ed3f2197cdcaf9637b67fd39d52fd7ef6a174a4fc352cc5008da5759
 DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 SHA512 6fe55bb5c97e672c05eb125defa590cce9575be339a7366d49c2c50aff19fc7d9a5dcf7feece4781e88cd3504c8e959a637c1a4a3e571d52c42e63edc0f60a78 WHIRLPOOL 9e70a07eb8fef72606e28ae2151003aebba724f86b29f9c46f3850a77b1647d9ce5746576c3e41f79b885b162b9889f233f77c2c5766103f5add6d5bc8088b40
-EBUILD psi-0.14-r4.ebuild 4990 SHA256 ab9edf40ec6ee28975d60e41d8348b72bab3886ea107a9f2e86cd1d212bf6b67 SHA512 0d8244d18e95b6068f2573be563a51fd1cd2faea7c76a0c36e4289f1bf1f803f203e329981fa981ff30acd456a9519875e0fc7428f6a2c5e5b2ac7b25776965b WHIRLPOOL c8bc9763349508cdec3e7a3d484da98ca1ac575332d4dd63365adf0f99dc912d8a68e4c590b52909ab5928ca9decf3363d8658c088be6d68b2c736766813f9a4
-EBUILD psi-0.15.ebuild 3039 SHA256 bc6352af0f4cdaf938fe795661305964f1d7b298dd8362ca648763354deefb20 SHA512 96574b77a9e1bd5491ece0d9b05ac9282108e181e365d209f3112e84019fc6a86c9d20bff5e965cf0dc782e60f5847df4ae755346e893e5f2c60767a89352654 WHIRLPOOL 7b0c9fe210816bab743369a9ec809284799264a95076cbdc2f0f756577d15f82cdc751923499e25b51b3ef78def73cd4328e1c3ba2245d502d434a013cbf4e6e
-EBUILD psi-9999.ebuild 5845 SHA256 b9fb6514e00bdeaac1e00724ad0ac80b2f86baacdfd1b00a576accd28aa73ac0 SHA512 6396713633767c6b69dfd3062f46f70e5d5c6feef03a2e12dfecec67f536141a74dd4ff9b822d4abc0d8851e0e0a054b0d977039a5ea3706afebba7f61d957fc WHIRLPOOL c57a4dea523df6c4f8ba89d8ae513d4b896e76fc6d786a161b5a891241bf51c85c9e781c82f23a0ae0e1e7c6c0e53de8c267f02c5248a43f71710636ff9ce840
-MISC ChangeLog 35712 SHA256 8026777583042eda061ed263d046c346b9e0ec33edbde7037632344a78ed2601 SHA512 9993041f11f2f43c8155811adbe3ba7e9d093154f15414e03ef829ac2c910c47ab25454f25faa2e3db55bd74355ab85e018e952e849cefdea7cca2e0de6292cc WHIRLPOOL 47291c43344e3cb58c26fb99d23a56b23be70efafddcdfe5e17c60de0809c4c7218c8a20f0b22388d31fda754b122aedcdeeda5570b2e3a48088f8531b6abb0f
+EBUILD psi-0.14-r4.ebuild 4958 SHA256 8f56d997cdfd7823e7c8e8523fe23a24711dd3dcf291334bc81fb17d090dde69 SHA512 178b3d88c33cedd802306f0fd280a9042b8b47e28fc9d2bf80e376ce8d7d1aaf1b5d2c0a7eb9bfa621537b05ac5cbc8f68e6c661484d170ede5336b468629ce1 WHIRLPOOL d9a48690b7da21582d8fbd39d60a053864620c1776308477903a7055cd8133cd514bd49541064350e7dc5639e3addecbc2725efb0f2df0d1a793fea7611532d0
+EBUILD psi-0.15.ebuild 3011 SHA256 2fd42a88effb93eb9ae15d70d6c5fa4724d2e869f6c52fa97bb9e490b89c965b SHA512 1c0faaf95fbf2b7895f388bba60e84f1c5aeaaecaf885b23c1de47a690368e5637760c584e8eff8f07d8379d8471105e4c8806b5cc52a94fe715fae528a711f0 WHIRLPOOL 95e242bece94ef06a18562bbb83de4a646d7311765ec918decb9706f62901f6f8dc3e9d3f9f64533527b0e1066e3a29109282e076117ada6f1c480711740ebde
+EBUILD psi-9999.ebuild 5815 SHA256 de91743a701e0a7be39eaedfda5419ea89f5dae7241713812fc9ac4ecfaf94c2 SHA512 e671b5d9fe0eea0e2d6042b389dfef4aa0c6ce3b4a1cd0c1c68015f2ef66769275bb3e7a331c48ca5036c73150268926701af524179203ee305f75b6dd5a4a43 WHIRLPOOL bc57ce832f0bbfa74d4cc9b0344da6c56ed143e0ced3244bcbe981c60b5a8f35af896932378816dbb219e09a9716824f22b9af12d452add2c2d0d698008b5530
+MISC ChangeLog 35879 SHA256 728558467d4740604ad933e455012ef00778c666473bb064392522c424e0a8d9 SHA512 5e801d50ae5c08eed2947d4f5048885ebf4392bce992cfd1546d7240cf791e0b08c32706f10a2f7d3f826c4371a10c940cf6b99a2ceb347ca1dbd697ed70c47e WHIRLPOOL e1f2d4f3b589439e36332e53694a4288c5c8669ec819774b1254cd655550f473b1ebf4e4d5a0bbafa82261d3ee451b392a6210cc3eb3c39942d7f34d16a8b881
 MISC metadata.xml 1012 SHA256 4fa097914fca02a97f51a7cbe42533d2ef26b74e844826bb674be8bdc4634b62 SHA512 6db07cb78a6efdead59b6de56bb8557c2bd3793dcad652ecaa92f51bc3e13af17b4665a4b6b66b5264b2d47354863d85bd317d0b84ac0f7a3fec21ad0997b68f WHIRLPOOL 32c281f7954ef840e32f7acc035d822e297af7e6997a82b296cfc2e91bcf46fdab10b33577f1eee2a1cc65f9fa45980632132167ec16b4a922e73ca3adc00cf9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyWYP/jI/ffGhTUdQOSQdhTnQhFLK
-j3pnRZ67w+kRrWvLT3RPnwsSd8AEBDipUAAaCBkmlnGW86+o1KSeWsTZRy62sDfz
-sPG0Dt9kS6dVHWFpgZf/ksQWx5xw2fwuE1BMao/k63fs8KaPlhCm82YTxsMMVBcN
-xY1X/VYsSyNWGMPAhNqINSeQDPWiYIxOyaYgxH2TpeF+ky5B5YBdTMSGmJ3OHXXG
-dKtE17l/hP4F4t15UThszyhinhPNvv+EUVi8Sglr1RHWkZnXKuhITgMGyGOtbvQ+
-V9qAZptn8pVvZSoRJDuGPpDrJ8bbDOpMSN6637zTpjG09Tlg5Hd6qcY2kUJDaTnV
-uAX8Y8OjHkMkQn8UaJSbqGsLtLduKy/wjojudywTrtgjqiInujLI0+yKtf1EbgJR
-L+HNsR0mIK8i0XO5RYhUGoY3445EWwSZ8Bv9bOlGyLFoOVRv+gifjHKbXUjaxC6s
-UUAcmG9Q9lteV3dIFzFfMxtIVXde7oWo86UxzuAD4AWL8yCUcdA940oSA68U+p+h
-1ayS4bMtncoeWuWSA2SgDraqD2fGnRqaevlJwnkOySgXfbsZh3i38oRyXfZewFWv
-PcQdlKBNBRBYTEnBZHfF3PX5NK0zhBX+HzKghefTWBQIPI9vVJszkLLI5GxU//vd
-v7yVB3OOJo9saxit1f4t
-=k+OJ
+iQJ8BAEBCABmBQJVrvgfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9RtUP/0qlEkCdoDAmUTLcdLQzBp+F
+J5ajbOQkQMt3bt3FQF4ZxERWemkz/3nNqfcqJ1WhJboQYTs9tjXH7MwZ7dRDysvX
+N8DxULhEnVYBg/sanpbf0qQi5zKTZu5zZNoBm5KqNTLnm5J+ORP4SSRolaH9s+P2
+DgWXpn9aWoUt+KKqXpnadX2tfvblPI7stHnO83d58iM63GqNvmnh78Bj8w4Hr6Vg
+EQ3Vcer+sH1f2ZpuuBh7+R8JSv8TGOeP03qTiXP2bq2kpltf/A5vTyNHXdmWKPfs
+oynX7b5soin+5hP55TUGlEdNmU+kCtlJubmEX257P1hHW0F88QZShg27yo0WezMG
+k1656W4wxYZUiizUqsFT/zePqcB7/nCbrxvkUXeqm/7ERO6YtJuRp4NQpMRi+U6/
+8E6Trp1mqtIlPLOwHAK0okvzfEZsShIVeimIlEPs5qJYEYcIaFpMcB7HMmyqZEfi
+KsOg4eAB+qv1z++iJBkre8PN5w6/sqM7XfwyspAHlZ0dcq1OH8dpOEtI1AHDnsKd
+uc6DnMlLNxcEzQ0cnw/NLOlbEXwPfARa4tCXXFcfDNZiEg+dwjXZGu3ALVhRjNSD
+gY/2L0EBuucM5tboEUnU1fzDp6zx/KZnSnD5V/M5rcM/+athq6tZSe1i14iyk5Fp
+AxJFZrwdGV/ahTP7yw3o
+=29b0
 -----END PGP SIGNATURE-----
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? (