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!)

7 files changed, 20 insertions, 31 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 57094bc0e59d..1bf1a9571fc6 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.189 2015/02/16 22:01:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.190 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> quassel-0.10.0-r1.ebuild,
+  quassel-0.10.1.ebuild, quassel-0.11.0.ebuild, quassel-0.9.2.ebuild,
+  quassel-0.9.3.ebuild, quassel-9999.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.
 
   16 Feb 2015; Johannes Huber <johu@gentoo.org> quassel-9999.ebuild:
   Update dependencies for Qt5 based kde support.
diff --git a/net-irc/quassel/quassel-0.10.0-r1.ebuild b/net-irc/quassel/quassel-0.10.0-r1.ebuild
index 6b2d45f9d4f6..500092dc1a47 100644
--- a/net-irc/quassel/quassel-0.10.0-r1.ebuild
+++ b/net-irc/quassel/quassel-0.10.0-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/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 1.6 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 1.7 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -20,10 +20,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:4
-	crypt? (
-		app-crypt/qca:2[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( dev-qt/qtsql:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-0.10.1.ebuild b/net-irc/quassel/quassel-0.10.1.ebuild
index 59d7daf8fd9b..a45eef1ca392 100644
--- a/net-irc/quassel/quassel-0.10.1.ebuild
+++ b/net-irc/quassel/quassel-0.10.1.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-irc/quassel/quassel-0.10.1.ebuild,v 1.3 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild,v 1.4 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -20,10 +20,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:4
-	crypt? (
-		app-crypt/qca:2[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( dev-qt/qtsql:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-0.11.0.ebuild b/net-irc/quassel/quassel-0.11.0.ebuild
index 1343ad137b4e..719dfc198dc5 100644
--- a/net-irc/quassel/quassel-0.11.0.ebuild
+++ b/net-irc/quassel/quassel-0.11.0.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-irc/quassel/quassel-0.11.0.ebuild,v 1.5 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild,v 1.6 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -26,10 +26,7 @@ SERVER_RDEPEND="
 	)
 	!qt5? (
 		dev-qt/qtscript:4
-		crypt? (
-			app-crypt/qca:2[qt4(+)]
-			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-		)
+		crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 		postgres? ( dev-qt/qtsql:4[postgres] )
 		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	)
diff --git a/net-irc/quassel/quassel-0.9.2.ebuild b/net-irc/quassel/quassel-0.9.2.ebuild
index 618c52562755..e59e0db12e4f 100644
--- a/net-irc/quassel/quassel-0.9.2.ebuild
+++ b/net-irc/quassel/quassel-0.9.2.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-irc/quassel/quassel-0.9.2.ebuild,v 1.10 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild,v 1.11 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=4
 
@@ -24,10 +24,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 
 SERVER_RDEPEND="
 	>=dev-qt/qtscript-${QT_MINIMAL}:4
-	crypt? (
-		app-crypt/qca:2[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-0.9.3.ebuild b/net-irc/quassel/quassel-0.9.3.ebuild
index 3adbb2c5a9a5..b111291dfb26 100644
--- a/net-irc/quassel/quassel-0.9.3.ebuild
+++ b/net-irc/quassel/quassel-0.9.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/net-irc/quassel/quassel-0.9.3.ebuild,v 1.7 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild,v 1.8 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -24,10 +24,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 
 SERVER_RDEPEND="
 	>=dev-qt/qtscript-${QT_MINIMAL}:4
-	crypt? (
-		app-crypt/qca:2[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 4b97b4941737..7fc867d36850 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-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-irc/quassel/quassel-9999.ebuild,v 1.79 2015/02/16 22:01:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.80 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -27,10 +27,7 @@ SERVER_RDEPEND="
 	)
 	!qt5? (
 		dev-qt/qtscript:4
-		crypt? (
-			app-crypt/qca:2[qt4(+)]
-			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-		)
+		crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 		postgres? ( dev-qt/qtsql:4[postgres] )
 		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	)