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.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

5 files changed, 23 insertions, 12 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 7a1d7a9fb970..4e1c54ecfd74 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.274 2015/02/18 16:26:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.275 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> kdeplasma-addons-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; Michał Górny <mgorny@gentoo.org> -kdeplasma-addons-4.12.5.ebuild:
   Remove KDE SC 4.12
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
index ea23fd5b3f4c..512f3b203cdf 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-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/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v 1.6 2015/02/17 11:06:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v 1.7 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-cpp/eigen:2
 "
 RDEPEND="${COMMON_DEPEND}
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 "
 
 src_configure() {
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/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