Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 91b0e6cb7b648d31c87e5a6dfed545261b6ea952..b1ccdedbe8ad0212d82c118d3d600540962bb4fc 100644 (file)
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/psi
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.239 2014/08/05 18:34:19 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.240 2015/01/29 01:08:31 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> psi-0.14-r4.ebuild,
+  psi-0.15.ebuild, psi-9999.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
 
   05 Aug 2014; Manuel Rüger <mrueg@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 14426030cf9ace7cd591bcf0bd519596a671c46a..fdc7719b2ac2f9b7d2917546838398b865465d9c 100644 (file)
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX psi-0.14-drop-debug-cflags.patch 1098 SHA256 ca7878131af3697275fe7b83ffdbd89886ba6cea27a38aff495b0eb60c5ca5e6 SHA512 56f7dc088b8a6f8d06638932c1c5f2bd08461fd87764e1690fdeea9e28f266b7a8d7860b048db56ed6f98411a9f70738e1babd54248d2a0b5f055e6efc53e6dd WHIRLPOOL 47096000792e25ec80addddccb9d104ded35296d195ebf99b72ec2dc61d391657467d8d231262e7e3f60c66079bf199540faba3671b61f6c802e75d40724b9ad
 AUX psi-0.14-input-validation.patch 7440 SHA256 4f8f52b6846b238586d8584d8ca5a62b56bd5bfad328765eb157dc95c83bf017 SHA512 e6f1676c57c71c5b43f1e913299cdd2ba5323dd39f2d255d8aee7ca63a429023f6ef477382894e4d358c08ae1b64d4ebe369aaa0c3b237fd7f6f72c508deb329 WHIRLPOOL 08bd4fd7ef168b474b5bcefb4d0bc43c85d7f9361661c445cd7203502beda4343ab45cc4f0477a00dd15d40bdf1d8c434736bb2f2fd803ed11ee3c15d60ddd14
 AUX psi-0.14-minizip-detection.patch 6587 SHA256 7aba10692d2bd371f0c009abc8e99d2267f47a1ac15765294e232bd0ecd15f31 SHA512 02d62baa6a65c99ca631deccc71beeb5cb521a457535c01e71b04e6f6eb1f58ea54d43b27b9d331731d49123d8d4681a4788c89aacb5afb84faf9a78896d2474 WHIRLPOOL b8dcd6eece7a022eb9cdd7cfd696fcf65f8672689141fec6881f7d21fa2ca016bec494c7d1672a38343827c11d82ef3fe4b07517df3969caa6d51d638429c261
@@ -20,8 +23,25 @@ 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 4974 SHA256 f6a6b889ac287e4eb76f087e1948b8cd297fb560d1dabcd52a7d398141e07d1f SHA512 dcb09eecc6013b52522981f43a00c7785362c8c43d60a78c6e09cf0b30af04f13171b6ba2e75ae83216f8bff6887b464cda1a25ccb518417e40e82ba85f15fde WHIRLPOOL 7d0b54b1815e833d2cc2b95e1bf4afa2665a6969e92977155709c7bff886ce9d36dd72a05c5cd13336655c3708da4b673800df08bff8830337ab1d9f59c05534
-EBUILD psi-0.15.ebuild 3026 SHA256 812e88a1da8ec7e7ebdf1b2e9ab71d26f341d48d2a0a3503d71bbd0649be470c SHA512 1d74cfa7c724006a6d2934692219a249a9251c4ee7e3ca853757a16038880d03b787d87f4f7e8a6e137098b5e206a244936ce214befd3488571fd083cbdab458 WHIRLPOOL b51798c7c2fa03a02e23a06d55aadd5ec9f1842a40a593df5997eeaed20bbdc9048f63174ccc77e59260e5ff2fd89cf00728e0fa8b30243a6e468023a69adff0
-EBUILD psi-9999.ebuild 5832 SHA256 e7d679b12deae082f4dc0fcfb2cfb259f37a7b52c3970d35f6c18ecaa7986b1d SHA512 cf59b1150e40eb7d29c7913b111fa33274ceebe64deff087fc12b70bbb70186686e8a3a7f009e19ec9408d04f7f48aa5809b62452a36defa6c6e27ec5b76d41b WHIRLPOOL 7dc48b97dc96c671783eafa98495db7db57307f474ec76facb60ec33c4bc82e96157553601abacae9347f63c5da84a5c084d60456244d5eae9039bbf23808c58
-MISC ChangeLog 35266 SHA256 31b53e1c7dd4f301d34328025333787cd2bfc48c5b66d3ca492be3b7974767e4 SHA512 80285556bf44673df2f6c65c5a35b68b328b97529fa4dcde74dfad386c4833b70b8e8ec09174f547e81858389d9a38576849bea06bf380bc373fecc3aa09d7fe WHIRLPOOL a4a08625aa2527427ccebbed080b6f70956b38b1c6782b500ba36e5bc922e8622c30a89b29b86cc128bad51b85ea1054ca61f76e176548f5915724acada0de97
+EBUILD psi-0.14-r4.ebuild 5073 SHA256 a6f5745f424ff62b70d22c3b8a8608bf6093e7a86a1f55f593654e2428e74073 SHA512 18b576bbc41056fa6f3005600f597284c4c16f580bce7f515c9f82ed5060905f8b5db3a9402ab8fe46d61b6a79474f0665db63f251b05a475b683b1b1e510199 WHIRLPOOL ffb59d1d691988892d2b8ba67cbbc4359de0a950037503cd62338da52cb24db9e110f512f2e2b5c0b2dd3a8f1b3858d83ebf1c788f5082aae24ed6ea57890b9a
+EBUILD psi-0.15.ebuild 3122 SHA256 c9f534dfd45350601704854bd27a2f5ecffe0af25c29cff1848fc89feff27bf0 SHA512 3aaee5680b99d86629292c0856511262a9244ab1b762a2fea4b55e7b2cc5f859e6598c9b85a1ed38473c5de25f69402390dc5e6c75aa90c27b289fae12f44807 WHIRLPOOL 89101bfe53e8c8672551d5d4a52b4caabab05223ddbb24a52a5e182bb516c624cddf5ff77a2cbd39e424d9907ba7650c1f0ff020dbfe17a39627e49f291b7a84
+EBUILD psi-9999.ebuild 5928 SHA256 607bc005c5de4e537dd5cdf70fc41bbffa34708a590c76801739405aa95fa955 SHA512 bb1112bfcab12622073a5b25ff2cb055bc686d8c3fd6c23468a8fa9eb2840ea9628afa38d8a8ff713d35681c188362166fc239467bfe9f3df5025901511f7b6c WHIRLPOOL 38215cb079d82683de7e3d7764739c04564610262b830b197f8d81736cc4fa8944035fbb6f525b613756a4cefe119795ef8c190392d02e4a23f8105b3aded897
+MISC ChangeLog 35441 SHA256 e205e2fdbfdcb2955bd41a47f240a82a2ba546b7826e6694afc0c769ec83381b SHA512 806e1847c9aea16e1f40f99dcdefa59ec57b7d5cc69535decef1d82d251839c764d82a0847621df2bafa1591fc1b83c94ac36a5937f5d5c4adbda4eacb21de3a WHIRLPOOL dacc710550fd70000639eb025069bc56578f61be2452d751fb7a5d8107a1ffa83801da5cd833f7828efa5301cb8c01aa0e3040b0296582e813122aca1cc39d58
 MISC metadata.xml 1012 SHA256 4fa097914fca02a97f51a7cbe42533d2ef26b74e844826bb674be8bdc4634b62 SHA512 6db07cb78a6efdead59b6de56bb8557c2bd3793dcad652ecaa92f51bc3e13af17b4665a4b6b66b5264b2d47354863d85bd317d0b84ac0f7a3fec21ad0997b68f WHIRLPOOL 32c281f7954ef840e32f7acc035d822e297af7e6997a82b296cfc2e91bcf46fdab10b33577f1eee2a1cc65f9fa45980632132167ec16b4a922e73ca3adc00cf9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUyYgUAAoJEGVpnaTzz9K9pFcQAImIx1RBV81XqCZ5SocJrg0T
+nlcgJAcmMelFSVlGmQPXKsObcZP17o7OWB2kPhKov5bKZxHlg8uDcsYvRagtx6dX
+L8Ej+wDTKlgvY+R/bxw2veMHuM86zV7sssWxQ6BelV9mVHRlEbe7YuTXPNAbqVWE
+Q8dIlPsSAZmzgGbNxCZhSeZKPd28AZDPLuKwjmV9vOyOhPHGnroAxOAn4f3KGIxB
+x9EqiIGt2qb8d+W1ay+zhetVTqwHlbDFwj3T2gUPdId2ZQrJl231k2zes6Lqx8Pl
+Ldsrp2aYYp2orVnCSWMV5wcNL2nVuRyPV8gNpZpNbNVgVTKg4pJpLMjHHNqQLP6v
++/559S9Kp2DTN5Es0QCbyWV3Y0TiD8xNOnwKzaHOUeiXdUnLhV4rw4PW7gaHTION
+8y5aTfzxjFDSRSDK7i3wAOcQ8LPtga58qmg1QBzBIlW7BdVROVuReeJsECBu9AP0
+vxVGCnCGOu019Y4MH1brTzcjv0vrPd2BQwDc/gmwmR6yt/HM7KFj+KZE0Ix9uj3B
+8RLdZUbjZnYXFMPxoYo9hMe5unacCFwaqD3rfCuwGOtwKlgqGk5wpLR5OfkRJreI
+FBUIjeaYi8gQiqU2Uhwv0kTbbFbb4djY5wfGbSpPNl/KaqT7xDTGnTUp5rtAB7TF
+p5JxTU5KnbEjczobYeMt
+=xcw7
+-----END PGP SIGNATURE-----

diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild
index 07f2b0a367d18100dde5d51fdbf8ac5a631159db..42cde2588bfe4c1740a0d016bc8af06bcda1ed4f 100644 (file)
--- a/net-im/psi/psi-0.14-r4.ebuild
+++ b/net-im/psi/psi-0.14-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.16 2014/08/05 18:34:19 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.17 2015/01/29 01:08:31 johu Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ done
 
 RDEPEND=">=dev-qt/qtgui-4.4:4[qt3support]
        >=dev-qt/qt3support-4.4:4
-       >=app-crypt/qca-2.0.2:2
+       >=app-crypt/qca-2.0.2:2[qt4(+)]
        dbus? ( >=dev-qt/qtdbus-4.4:4 )
        spell? ( >=app-text/enchant-1.3.0 )
        xscreensaver? ( x11-libs/libXScrnSaver )
@@ -44,10 +44,10 @@ DEPEND="${RDEPEND}
        sys-devel/qconf
        doc? ( app-doc/doxygen )"
 
-PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
+PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
        jingle? ( net-im/psimedia
-               app-crypt/qca-ossl:2 )
-       ssl? ( app-crypt/qca-ossl:2 )"
+               || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+       ssl? ( || ( app-crypt/qca-ossl:2 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 d15d21b99b51a67527eef9d404461951b028d7a4..4c184b6db19997a922b51e93bc7baf8a4e2659e6 100644 (file)
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.4 2014/07/04 20:10:36 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.5 2015/01/29 01:08:31 johu Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ RESTRICT="test"
 RDEPEND="app-arch/unzip
        >=dev-qt/qtgui-4.7:4[qt3support]
        >=dev-qt/qt3support-4.7:4
-       >=app-crypt/qca-2.0.2:2
+       >=app-crypt/qca-2.0.2:2[qt4(+)]
        x11-libs/libX11
        dbus? ( >=dev-qt/qtdbus-4.7:4 )
        spell? ( >=app-text/enchant-1.3.0 )
@@ -37,10 +37,10 @@ DEPEND="${RDEPEND}
        sys-devel/qconf
        doc? ( app-doc/doxygen )"
 
-PDEPEND="crypt? ( app-crypt/qca-gnupg:2 )
+PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
        jingle? ( net-im/psimedia
-               app-crypt/qca-ossl:2 )
-       ssl? ( app-crypt/qca-ossl:2 )"
+               || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+       ssl? ( || ( app-crypt/qca-ossl:2 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 2b48f8b46538f18b2846e2637168ad46997874ca..1db012c8c4d2f0fccd5992fbf49cacf0a85cfe19 100644 (file)
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.21 2014/07/04 20:10:36 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.22 2015/01/29 01:08:31 johu Exp $
 
 EAPI="4"
 
@@ -32,7 +32,7 @@ REQUIRED_USE="
 
 RDEPEND="
        >=dev-qt/qtgui-4.7:4
-       >=app-crypt/qca-2.0.2:2
+       >=app-crypt/qca-2.0.2:2[qt4(+)]
        x11-libs/libX11
        dbus? ( >=dev-qt/qtdbus-4.7:4 )
        whiteboarding? ( dev-qt/qtsvg:4 )
@@ -54,12 +54,12 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
 "
 PDEPEND="
-       crypt? ( app-crypt/qca-gnupg:2 )
+       crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
        jingle? (
                net-im/psimedia
-               app-crypt/qca-ossl:2
+               || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
        )
-       ssl? ( app-crypt/qca-ossl:2 )
+       ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
 "
 RESTRICT="test"