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

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

3 files changed, 12 insertions, 62 deletions

diff --git a/net-im/dianara/ChangeLog b/net-im/dianara/ChangeLog
index e237e6eb8aa4..209823b35632 100644
--- a/net-im/dianara/ChangeLog
+++ b/net-im/dianara/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/dianara
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/ChangeLog,v 1.18 2015/01/26 10:08:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/ChangeLog,v 1.19 2015/01/29 00:38:21 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> -dianara-1.2.1.ebuild,
+  dianara-1.2.4.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. Remove
+  old.
 
   26 Jan 2015; Agostino Sarubbo <ago@gentoo.org> dianara-1.2.4.ebuild:
   Stable for x86, wrt bug #535566
diff --git a/net-im/dianara/dianara-1.2.1.ebuild b/net-im/dianara/dianara-1.2.1.ebuild
deleted file mode 100644
index e95c76c74396..000000000000
--- a/net-im/dianara/dianara-1.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/dianara-1.2.1.ebuild,v 1.3 2014/08/10 17:39:43 ago Exp $
-
-EAPI=5
-
-inherit eutils gnome2-utils qmake-utils
-
-MY_P=${PN}-v${PV/_beta/beta}
-DESCRIPTION="Qt-based client for the pump.io distributed social network"
-HOMEPAGE="http://dianara.nongnu.org/"
-SRC_URI="mirror://nongnu/dianara/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-crypt/qca:2
-	app-crypt/qca-ossl:2
-	dev-qt/qtdbus:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-libs/qjson
-	dev-libs/qoauth
-	sys-apps/file"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doman manual/*
-	dodoc README TODO CHANGELOG BUGS
-	doicon -s 32 icon/32x32/${PN}.png
-	doicon -s 64 icon/64x64/${PN}.png
-	domenu ${PN}.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-im/dianara/dianara-1.2.4.ebuild b/net-im/dianara/dianara-1.2.4.ebuild
index 1cf8788e192f..f1ca72085d76 100644
--- a/net-im/dianara/dianara-1.2.4.ebuild
+++ b/net-im/dianara/dianara-1.2.4.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-im/dianara/dianara-1.2.4.ebuild,v 1.3 2015/01/26 10:08:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/dianara-1.2.4.ebuild,v 1.4 2015/01/29 00:38:21 johu Exp $
 
 EAPI=5
 
@@ -16,16 +16,17 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="
-	app-crypt/qca:2
-	app-crypt/qca-ossl:2
+DEPEND="
+	app-crypt/qca:2[qt4(+)]
 	dev-libs/qjson
 	dev-libs/qoauth
 	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
 	sys-apps/file"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+"
 
 S=${WORKDIR}/${MY_P}