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

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 21 insertions, 17 deletions

diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index 8af97cbc3df0..61fbb75f0874 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/qutim
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.35 2014/12/31 13:35:53 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.36 2015/01/29 01:18:11 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> qutim-0.3.1-r1.ebuild,
+  qutim-0.3.2.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
 
   31 Dec 2014; Michael Palimaka <kensington@gentoo.org> qutim-0.3.1-r1.ebuild,
   qutim-0.3.2.ebuild:
diff --git a/net-im/qutim/qutim-0.3.1-r1.ebuild b/net-im/qutim/qutim-0.3.1-r1.ebuild
index d44a5f28b88f..14a8ec1d783c 100644
--- a/net-im/qutim/qutim-0.3.1-r1.ebuild
+++ b/net-im/qutim/qutim-0.3.1-r1.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/qutim/qutim-0.3.1-r1.ebuild,v 1.2 2014/12/31 13:35:53 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v 1.3 2015/01/29 01:18:10 johu Exp $
 
 EAPI=5
 
@@ -33,19 +33,19 @@ CDEPEND="
 	aspell? ( app-text/aspell )
 	awn? ( >=dev-qt/qtdbus-${QT_PV} )
 	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
-	crypt? ( app-crypt/qca:2 )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
 	dbus? ( >=dev-qt/qtdbus-${QT_PV} )
 	debug? ( >=dev-qt/qtdeclarative-${QT_PV} )
 	histman? ( >=dev-qt/qtsql-${QT_PV} )
 	hunspell? ( app-text/hunspell )
 	jabber? (
-		app-crypt/qca:2
+		app-crypt/qca:2[qt4(+)]
 		>=net-libs/jreen-1.1.0
 	)
 	kde? ( kde-base/kdelibs:4 )
 	kinetic? ( >=dev-qt/qtdeclarative-${QT_PV} )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	oscar? ( app-crypt/qca:2 )
+	oscar? ( app-crypt/qca:2[qt4(+)] )
 	otr? (
 		>=net-libs/libotr-3.2.0
 		<net-libs/libotr-4.0.0
@@ -70,8 +70,8 @@ DEPEND="${CDEPEND}
 	kde? ( dev-util/automoc )
 "
 RDEPEND="${CDEPEND}
-	jabber? ( app-crypt/qca-gnupg:2 )
-	oscar? ( app-crypt/qca-ossl:2 )
+	jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
+	oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
 "
 
 DOCS=( AUTHORS ChangeLog )
diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild
index 3c0cac461329..3758f6dc3dc7 100644
--- a/net-im/qutim/qutim-0.3.2.ebuild
+++ b/net-im/qutim/qutim-0.3.2.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/qutim/qutim-0.3.2.ebuild,v 1.5 2014/12/31 13:35:53 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v 1.6 2015/01/29 01:18:10 johu Exp $
 
 EAPI=5
 
@@ -42,19 +42,19 @@ CDEPEND="
 
 	telepathy? ( >=net-libs/telepathy-qt-0.3 )
 	jabber? (
-		app-crypt/qca:2
+		app-crypt/qca:2[qt4(+)]
 		>=net-libs/jreen-1.2.0
 	)
 	jingle? ( dev-qt/qt-mobility[multimedia] )
-	oscar? ( app-crypt/qca:2 )
+	oscar? ( app-crypt/qca:2[qt4(+)] )
 	purple? ( net-im/pidgin )
 	vkontakte? ( >=dev-qt/qtwebkit-${QT_PV} )
 
 	aspell? ( app-text/aspell )
 	awn? ( >=dev-qt/qtdbus-${QT_PV} )
-	crypt? ( app-crypt/qca:2 )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
 	dbus? ( >=dev-qt/qtdbus-${QT_PV} )
-	espionage? ( app-crypt/qca:2 )
+	espionage? ( app-crypt/qca:2[qt4(+)] )
 	histman? ( >=dev-qt/qtsql-${QT_PV} )
 	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
 	hunspell? ( app-text/hunspell )
@@ -88,8 +88,8 @@ DEPEND="${CDEPEND}
 	kde? ( dev-util/automoc )
 "
 RDEPEND="${CDEPEND}
-	jabber? ( app-crypt/qca-gnupg:2 )
-	oscar? ( app-crypt/qca-ossl:2 )
+	jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
+	oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
 	|| ( kde-apps/oxygen-icons kde-base/oxygen-icons )
 "