Update dependency on QCA plugins to use USE flags on app-crypt/qca:2 unconditionally, to provide a single sane path for dependency resolution. Bug #541066.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 33 insertions, 25 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index fb2c3495cbe3..271801063c28 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.457 2015/02/18 22:36:15 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.458 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> kopete-4.14.3-r1.ebuild,
+  kopete-4.14.3.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   18 Feb 2015; Johannes Huber <johu@gentoo.org> metadata.xml:
   Cleanup metadata.xml
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 507c24653827..fbee67de38fe 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -2,24 +2,26 @@
 Hash: SHA256
 
 DIST kopete-4.14.3.tar.xz 6317288 SHA256 ba23c6dea57233e0861865a1d76c356b0d3f7037f95e2166d0daef14e6c13845 SHA512 33a433da426e7a4a519f033bb14635f31c92954f8e6c46b41759f4e1e41197aed9d07894b163a1e484648ac0e9f92914afe20dfbaa8ddff56b8751d426afd9fc WHIRLPOOL 62d8df47f3214b8cf05fc9ffab3662cc10a1402fd2d33339adb91cd91651c2652dc1dd637130f9e77bf77825b23e19c813f5c43614160cd4dcec945c19e3542e
-EBUILD kopete-4.14.3-r1.ebuild 4243 SHA256 fa229c7f45d093d1c1bb3608fb0140400e031f047f4af1803ef556513150e15e SHA512 9f8d65460ad3b6a4807fed74e974c452053e464866f4ca62a5ba93f1ddc2a9f592bcc1554b6f7b2403ea84def1b3c0520f0aa4f957ef1d63b11f8ff1ef5718d9 WHIRLPOOL 2240ad87640bd0b9617680dfe270d8887db39681486bdc78d90e8c8107f9d324658c1095d6eb894db1d79b55c8fe449ec3fe14bd28f110c9fe4276a9a210bc1a
-EBUILD kopete-4.14.3.ebuild 4098 SHA256 c0de1946b0eb148c52f974710ceccb83472b6a1997d2fb6635c4835043e31dd4 SHA512 bc929ec02d6cf1a1761cf1ee31c61a119066b9949ab3c454341067ae641c42ddad4b4731eae9b77423a9a54cf9dd2fb8d8172698ea491baad88a3fbfc1385a2f WHIRLPOOL 79e64936fa3fcbbf32dfdc1a1819018cd0f6c6169562610c650f5a2d2d404e388f87a7da5be989b56513031a319c1fdf88912f1f826b8845867f6e4cb40cc17c
-MISC ChangeLog 62193 SHA256 c5f198a6df17f38147872ac7cdd64fc3d586fa9e5a37c9c0b90b3e1d17550edd SHA512 2ef34fe126bff6608ac27d8a0dca757e265b87847f7d6f29c18e2136fdd19f3a0e4a051b0f54ed248f4e811872f78c9216e5ba442a9ba228f4fa9e8b9b00a8cc WHIRLPOOL 21cbf02f94bf3902ad65f8fec14d04b8e9e982204149de3545fbc4d97a36100c93843353fa1f95721bdbc6e2dd75eb4ff54c87bc624107170004c519fbad25bc
+EBUILD kopete-4.14.3-r1.ebuild 4234 SHA256 d942980f22d3b77f0a2101ac49211f1bab6ea110a00239bee80a438a94c7eb2f SHA512 d1750f1cef64e2a19b352f183f02ddda25fcb8438211a82f04b07102e1f0c7fe7bca133b8683744021683853bffb9337d431d5d9a1e45393d281e2646ce9b3dc WHIRLPOOL 83f5469d152f7ada6e5d5d10c0af5e7fa5c4cf6b01a36ffb3be90235d5c3287295b90c7cc5d7992f320c58b5a612e868b0186e462682dc3386571d86a8232019
+EBUILD kopete-4.14.3.ebuild 4093 SHA256 65772788abd5e74c7e9fa69b436deace309fc93002a29781bc61eff3e9ca85cc SHA512 e7a9f3addff1d8ddb1ee202632de5eeef5336d612e93184f7b86ed12c891254a8592db82095862bff4df9b2d40c4b10ddd97656e147b92ff1126e09482693d54 WHIRLPOOL 7ca69974c4b48d5c876616c432de01b01c75f73d8e4e6b103f8720cbe70c6ba013189478f5d93ce10ee3b2f4233acf0d80bb740568886b97351540ab12af56e9
+MISC ChangeLog 62457 SHA256 1b38221c6b012c7b15b1d8f5db373b6aac5fdb1063ff2aea720a0dc67c57f125 SHA512 0693be43212d51a461cd78033bc1a25fa79839c6b54234dd76a77c299a7ea8e31edea1084d482924b749f61f922a92e324f55c0a7ac0eb1493a756d65e6b8c39 WHIRLPOOL fb4d8a57da577840a9b33b29bc6b2dab5f7c1ba6860a0c49208782f9f7b92e9f8818f9d6235266399f29107fa9c5b5f2af22f731d7aded5dead8159148d85068
 MISC metadata.xml 2374 SHA256 d73201a3b2991d6bc67c6007b8893e51138e451f9c5f297696e03eb256976b79 SHA512 e13aec1cfd3c9c6367e898f0ce5f09d6bf6bfcb9db8dd3d1096f9065e3561124e88a4bce26cf6b95a71c37e3afd76a8da362b27ad75b46f3dc2ad1afd7320012 WHIRLPOOL f089b44618bfb9a97d5013fa89ecc19cef7353c6b173b8157bb85d130792d1dc9bb49f5302fa2e89163662bf3e5ef6a7f1650133f5e9e1d98b2a584bd463e2ff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU5RPcAAoJEGVpnaTzz9K9dXoP/06DVAajkuEAZ5pF/L1QPslb
-EpCyKutBtH13uVQHhlnkaB0YCVln4f4O7Ey/0d8Sv+AXjcaKJwjDun/wpl48rUJD
-7JI6EX8bnLbST2SZPv54xT5y0+vZ5aBaGUSqPDbxNqpwlccQRW+706D5JYqLRWoi
-AulxIyW9RNZXka0+p0iWrfUCuLPeDRhaR7g5BVJQrul6KLEA7DNLMQaGwFfqKWx6
-r1sBK+EKOh2mP4zqEI/2DGmoPvJSqkaPtDYOgpL/jcgSpxYSQMQ5VQLm8gsqsFss
-rvuOD9W2anP3JMaj0vTRbsFf6NbSHgS1hNpSOPV48szR2qV4e0NmF2DjeVOdMroy
-5mtlf+m4l5Tyr6+6xfx6eaWPdtCODqzudDjKlmBi0QAOKTyI552KOtK4bvNYpK0Q
-tx38m1Z3AC2Z7R2VYcIWZKzAir6wEMi1ch7TR7La4O6FXR7m2Ku9mJt7Vjgk3olT
-89N/Bq7FIVEj9PcZNN8DsB8TSQbD2gi/gvSvj+8Elz/oQADa11nJ0UWDn6QAN/Zh
-aMK/U/8rJG+b/9FiPcFXpAt7X2F1ZBZc9R/Hyq/9WR9mk5QJt9IpO7zZCLRy+rjk
-8GYCm1qozcbpwSE1rLtFBpVnRkraVFN64h3AwT7qgoy7USAbytI4bHuac8w0SUQ6
-P6ocPgLcMtd3fYk9XHBd
-=Wi9L
+iQJ8BAEBCABmBQJU6iLhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7jMP/RW0K30SutsXAHNRdzdXY9Mt
+1iiRhiBtMvqjGlrlbOqKvjtyEM8TjY+G+FvquJa0pNwsXrf6YN6ifnd1uYRqXz1i
+nMbjQC9UWx/NzGmJ1JR5MGIdMwEN54rG0qrX40VLgj8GmsKSbRAk5GlJAz01scdq
+9iuqsMG/pn7vyNP8M1MZPOxM38/oFsw9/l7rFBirGlso5Qu6crmLfsM4k2vAF3lE
+JgNMnJvwNsaX11JLLY/YFHZPe1qUAV4giB+Y8f4IsHDVbf5NBGPXlPKk9FJonQrK
+NHyl32j8fpZl8XtWKXB6l0ZJNiSZc4d9fy5Fg/5FuuR35/qf89wOFGZ8QPL7SPfV
+diJWrtNHIn/A9so1sjC/aODIgRt7OOjUWSE6hG5dd8XGviS1POnYIlh+smLaypL2
+eB9BuMce0u/3+yymrrGBMo1WEjOH/nXLOpciIyRMy/z53J61kTQCcX2L/nVgaYR3
+2AWHOYbFDGlKN4SkIcu9M23sAbx2I1hFkD19KVNYAw130yXJDUPB4vevaH+86vpg
+qFZ4qyDRIurE/AMnRvrYmyLKHAPLDBGPJtQbaqOeXPdsOt+GxU6P2nxM2n02Ffl2
+v/22U0wld64oDMEBRDPHcDiG9gL4cOKXb622ViAJ0vrdyAsrbPCDqTL0Wl2NXiqn
+12o9Xg2MSlDcOWKO41l/
+=CuED
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/kopete-4.14.3-r1.ebuild b/kde-base/kopete/kopete-4.14.3-r1.ebuild
index c4162719efb9..290f9215e0f3 100644
--- a/kde-base/kopete/kopete-4.14.3-r1.ebuild
+++ b/kde-base/kopete/kopete-4.14.3-r1.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/kde-base/kopete/kopete-4.14.3-r1.ebuild,v 1.2 2015/02/11 03:35:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3-r1.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -108,7 +108,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"
@@ -158,9 +158,9 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
-			if ! has_version app-crypt/qca-ossl ; then
+			if ! has_version "app-crypt/qca:2[openssl]" ; then
 				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca-ossl package."
+				elog "install app-crypt/qca package with USE=openssl."
 			fi
 		fi
 	fi
diff --git a/kde-base/kopete/kopete-4.14.3.ebuild b/kde-base/kopete/kopete-4.14.3.ebuild
index cd0a08e7c719..8222445070be 100644
--- a/kde-base/kopete/kopete-4.14.3.ebuild
+++ b/kde-base/kopete/kopete-4.14.3.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/kde-base/kopete/kopete-4.14.3.ebuild,v 1.6 2015/02/17 11:06:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.7 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"
@@ -149,9 +149,9 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
-			if ! has_version app-crypt/qca-ossl ; then
+			if ! has_version "app-crypt/qca:2[openssl]" ; then
 				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca-ossl package."
+				elog "install app-crypt/qca package with USE=openssl."
 			fi
 		fi
 	fi