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

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 27 insertions, 79 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/Manifest b/net-im/dianara/Manifest
index 2b57f753dba3..96df1ea2ca8f 100644
--- a/net-im/dianara/Manifest
+++ b/net-im/dianara/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST dianara-v1.2.1.tar.gz 407594 SHA256 702f29b28bcbabb48e8b388f34120b93775395cb6cdb2248555a4dcc6e50e566 SHA512 c20f79468beb7432d42d4102c3d93a0702b48d5d9c0580785132f7b1da6904345c3bdc0bff7ccddd0670966a742d6d20478ec81377424c0f9586002da567b12c WHIRLPOOL 014c6bc823414d40ebdaeaf2dc9af89232c2a2a627dfd9e49b93daecf81d5debf5bc6af28fd3d67f7354b6e2b72ca1c0587b6a8f901c3a0bd33858c5573168bf
 DIST dianara-v1.2.4.tar.gz 540237 SHA256 8e58042e551646a09bd3c47838a1fb6d65c90501547ce4ed85944814d6e609d2 SHA512 78bacd0a02f5070b54d0a0aa74282592ab60aa734143c50f00f97f0dc09308f0571205608e0150fd4eb5cdca0083a5a2b0acaa2f90a00f84cd9cc6737dee30c7 WHIRLPOOL 940a6c2a0a1e15accaee24b40b96a87c0f8d947d65bfa7e7d3155ccdf90ca73b0ae6a8a7bc5f3281736f298f1748a352638d772153479fa5d4f1d1119febf636
-EBUILD dianara-1.2.1.ebuild 1058 SHA256 3614200d3ff31369e9f4001940f639890d48d9e368825d512040113737f06c2c SHA512 ceff67cbaef4a3dd285de3ae3de7dac425477efec2c9951917bfb3366093fe56f7e037ecff996fbcf1cbea7cb5815e912a08860690149620488e25ffdc775091 WHIRLPOOL 7ed453a068e2a213481fcf087f85d2804f37f3a7b6f2f4a14f23fd014986f91c1bb51c94b6b27afe08d35cfd8f726297ee9d2946da2783521a4df640e6509a24
-EBUILD dianara-1.2.4.ebuild 1058 SHA256 f28e224d62e2dac8585447d405aa18d9bf7fa2b247ecebef039b58f0e389d526 SHA512 4740e74584ccb2a2cdd5deff6b6317f25a2d1514f4cc2512a97d60ce3fff14aeadcb4e1767a50f63e2c5e76270522c70a391b0d89c5889fc8816a65bec61ea70 WHIRLPOOL 85b9fccbaf70ef5ab40079298a8e64ccf6833d33ce8ecc0e4981058ac3f1df4316637812d159e9e18c0b4dbba4c06562d531f07f52105db95035be27234828e0
-MISC ChangeLog 2480 SHA256 0fe344aba558402311c81467829754f3ceaafd2e8506852c4a608f5dc7a195bb SHA512 e9b29f4c2749e57ac99794216d5a38dbfdbeba916296d61d74f9dfc65f717b6e582e4a060357598570b64587158cec04493d4f9aa8d36787d93e28a7e9442544 WHIRLPOOL 2eb73e3f02ff0dad089131f243bf7bfd4c0aee95fe2aea2338a47e9b04454682fcfac0e4712c61521023a7ac8db710f3d7ed2c5abee06f185285f6e0e25add1e
+EBUILD dianara-1.2.4.ebuild 1099 SHA256 d59aa91b31ec1bd251ff78e6a78e71a6b30588fda66cbdcb1b215aef1b1fa8ce SHA512 bbf18463477997de9ba86e1e207c9c3dc9f105855aeacb2871887ccb54c678383bb0c764ab9c867a78d4edd653b3594d21c83250dbcb5bef2f62478b7c9246b3 WHIRLPOOL 4347f789ae9a21b7061b48b016608b4045aabbd8dc910ecfd2f8b083169f839dbf5ee4928a81d323597ab7ddc65993fdfa665335a7e16422cbd0f0d9f5e81ccf
+MISC ChangeLog 2662 SHA256 ea4e17ce0ecd8476686f47a8d75244c11dac89c179db0f8441efc52e176bc2c1 SHA512 a29c0a44ecf79e24ff0d1eab620c4b9e35f88933bf4359f7679aab40d908eef9d762088296f1a6e6403141b16b000d7b0177bbe68e97cb1832a343a14f21d134 WHIRLPOOL ee0a3bda975d1cd42dadf71836d1d421cfc64eccdb459bfcfeda817ef88f027d4f43b75b179c0bee1db7736aea0a771d672aed54fce555a8ab53eb890686c61e
 MISC metadata.xml 358 SHA256 0ef1fb1342181a03b47a6d516764261b8630a660eca17df29022819511718ef8 SHA512 bb317af7a7d451ac8d384875ebb54fef0510e365f26f811500f8b6a504a212531183d179757a2b98b394154cb46f1bb4a58292ef7ca7253572c56f46c6836123 WHIRLPOOL 4ae6b483ee32c58a3b9442e75faa9553dfcc467f8dacc9e211f4a6f05157184c070afff84a4e905b488c18442c31751fb4f2bc6f4c0b5406cd2ac9cdc54c74ed
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUxhILAAoJELp701BxlEWfbCEQAMUEQROrJMLUrlZuTCCejUfF
-3Lcf0wf9nfdA3XBWUXKNGAVGhRyDiVoao8cCqfFT7ULEMxLdWwrDzREPY396SmnX
-UoIAbOCMkS+yvi5ptZdbTKgg7J2g0NgjLaNIlJ6+ewXAz+GAeD1EbYWNGE8MCoDW
-5qSioMwTdVdRata6TafHdCn6FH0fiufFGVJOTiFJUbQe4Pbj16jOaKE3K+FuOXOh
-LzH4iG/hRd7nhVSX9GEnZXd2ixamyfVlmJjwC9z9v02ZcPlRKJXwH9t17eYFb/Y+
-oAawZI48SM2Qz5S0LGGbIaa3uxu9Ez4DfjXKRHOe71YtInkRqomC5RzLks1uQeGP
-ac8NBk+ZTNxLOK5d4u9mdp68T0rldOpUqUVAzi1dRgsft2eb9DFdVSy6GTz+5pnO
-431rSmuQOJ7IsZ2VYv88uc/TM1IinrD3FoasEZDE0diKVFkSAxOvAW0mAdWId/6o
-X/t/WxOuYEPQXXQxHh1L3tGiumUZDUFDyvVOYAPiIvMSNa0pNjfC2/R59ljFaR1P
-NVZYiO0Y2sRlexzew6h91XkKY9FZ9GwR4bd0ANcmbdwN5KK77mQaKCOcs8ztvwZn
-GWUDKScNFl8U+6A4drq+Fo/N71X+nUcBCUQzKQlm1BUTfZcXJZ1JNA309x5Fkieu
-WNg2PjV8EkqfjBys/wWj
-=wnOl
+iQIcBAEBCAAGBQJUyYD+AAoJEGVpnaTzz9K9AU4P/2Q3LvlLAmbEWYaTVA7R3fbb
+oIrBgMbhlQt4iHyUvd763xE3ryCqSF6USvb7ySGPtdemKUkUQ3bnZbXt0VDnCP8n
+fDssojLMYbS/IYFPsnF2VgxZsyOcqv4w+DOxmW78x2oDKgULl+A53oDff/jS4pVo
+/jbu7xXkHRTZrGkqXzuRZwXPsynjZl79cTyHZ7cG0Vv/qmdPlrNxMVEiky5f3joW
+pPUu2GX+PmS2FVDDYnZ6wG6eQnwuxiuGMtPJNAazYHlmTHWq79Qg+mroIWU/hvIS
+3A7x+FXcKJhLaDCJk8FVrjWC/JVhU1SrAw9W3CsxcJl66BtMaObwK84W9I0Fd2Yd
+IwYyoJl5lv/rHNDdk3x8rv+KbKsRrd6xKt1AKrkrEc4QqlqtpQ+EYtjJsXI1OOpu
+TNaM/Q2fCFeRxnuVjE4XfAMVlqeIW0fq/w6XSp/LmBvU2Vhg+04sO+9uovlSEXKi
+RWLRIdfvlJ5jsrVLrP02L0ANsw1QxFK6SjqHKi8wdmGA36IBz6RPI5ZVtAqxTi+z
+Y21kij2+tmngd6H160AgjWyqtpF+1dyX+N4WzWjb3TfTzp1Nwe/kQeJKngFQ/gkK
+NNS23slK5wRrDVZOG36TpWGrduSzg+VpfPy+FPqC/SdIaOJ/ui10ZSeiOKXPrwhJ
+nCdsJ8a0ZiA4zGTuWTkC
+=HlwJ
 -----END PGP SIGNATURE-----
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}