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

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

4 files changed, 29 insertions, 23 deletions

diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index 6b562150e4a8..de642f48df6c 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/tomahawk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.42 2015/01/16 23:34:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.43 2015/01/29 00:27:02 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> tomahawk-0.8.2.ebuild,
+  tomahawk-9999.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
 
 *tomahawk-0.8.2 (16 Jan 2015)
 
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 824a41275ec6..c55b79add6e8 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA256
 
 DIST tomahawk-0.8.2.tar.bz2 8563213 SHA256 522d2ef873f8548990ac1fc736c11dd08c347687c77d63b520f55207f19db3ae SHA512 30a95a583796a0a8082aaaf3e3555719b91eb18a8744eb72865c8105d16128b2b477d82838ae6914d38c6b0f09e700761e84083dab79d1375acb1ad88d919a26 WHIRLPOOL f81f3ffd41e9439355a6a9d7808c92a1c8d1295f18eea90be3a4f788e4dcfa80a956b85f8b3745f4c241ca306f51b43762d3d6a38635bc92d0fa59e35af1cc31
-EBUILD tomahawk-0.8.2.ebuild 2168 SHA256 ce1fb9b09fa5af361c9fc94fcdcc42b8a831629f548b7031e17e023459701e38 SHA512 a0882ed0e1ccb206442e50607bbb93293bd266e93a35307a973cfbe17c57ba53173016e140538f970378694a3a505a59dcf7c52eb89495ea4ecd1b0afcd65fc1 WHIRLPOOL 07f1afc074873d1dcaca457657197e0536f7e596d731cda792dd0eda15cda74d7dff95b955dfb67d1869a659265781dc9e0145811c97427f8abb4ab85e62b7ed
-EBUILD tomahawk-9999.ebuild 2168 SHA256 f47e1e6de909d38e75f5d6a9866787882457fe6f8a0465c434a6445ed19c6fa7 SHA512 22a211943eff7454139185169efefbf2ff7a937829ba478b652b3131ff32bb7f8a1aba12a5a9a87741fa08eae49f0e26692cf8686bcc269132fe674bbd9543fc WHIRLPOOL d1e82464e841c7c5c02eaeb06136b0bcb4ac3f222c3a3621d436dec6f924ba71d3482addccc144aeed103fbd63f645380180f2057d772c6a1d0e74291c16d46b
-MISC ChangeLog 6856 SHA256 c4477697bdd693a96b16af6dee19b3f6717827136cb1025de6e77c70e6f14358 SHA512 f59bb96526cab1fa81037050cc4c68060169a327262881061aa4f3e22e03b46e754f8fe1e1c9aeb2d4907ce8f8e923dcd9ed25b38eb6b87a0de192f0fcce565e WHIRLPOOL 76351be269b5b34114868de0eff132477bfd975f858b834399cba4c4fcc45576671aad4fcf99af467dfa99c12565542b54ab870daeb93ef7279ffa6e60557bec
+EBUILD tomahawk-0.8.2.ebuild 2237 SHA256 90b5d63a635d648c898657285d551a8c612388eb68278e59f97ed3d544454820 SHA512 cbbb1b4d0d643fa3ecd20eefea5804f2351744de3f3c3cf7075de7422d311e05e262410be985844d1cb07b3a9f4a657a9e9189c5c289cef76382b5a7314e5f68 WHIRLPOOL b895a714d710b4986a5569662fcdfe90e2d404b289be50debed0d3dc545fceb7d964881191c111319c9bc96efa79ec277090422b1341c3de6dc44d360b988209
+EBUILD tomahawk-9999.ebuild 2231 SHA256 7e90889ad7daec1f849c5996a4c0b2cd318d82aea6cde8b33fc51320b3a3d071 SHA512 8bc75f7dc01e4e7a0a46e50893007dd9f916a035d979b49a250cec58f5d156a5b18dfabc1c581bb89fe301793e3a22c0a37910e7fdf99e7981789708154c9fd5 WHIRLPOOL abc5679d913e620f27d6aed90974cffc6059f6b1442b8e7c13312c98e0947017099e8d8dabd415fe0c7ed32b6b8fa87c586add469948a41644fa3819176db275
+MISC ChangeLog 7023 SHA256 ab8315e8d3212ce11ac95bc7c4bc85b9fc94309d27b1d459b87e9baf467baf38 SHA512 794122e45d1982b8f0bd5f5ee11ccf867056b8838c21b29519073a26b5b3f3ea22fd6db2696df0407cd1cf2820fe2bd1c2278d633816586008d9a32ee7cf666c WHIRLPOOL 934e308e80790721ecb5b62efd127bedf84220caa893b22d60f0187f4df7f052740f2ec1c9c1a684e624f7c5587e08895d982bad72f6e8105f15d3e746623465
 MISC metadata.xml 449 SHA256 49d0ed467fa509bfdabea945cda8147db6980b565d5cf57ef0f7122d918973f6 SHA512 618943cbf72f232ab56ab529e08e9fb1f600b9c7885dc1a3d7e84f0bbf19bfd13befc253bbfc5b6f22863e9d890040f749fcbf50fe7c3c10825464f30f654343 WHIRLPOOL d13c16baef4735c911d00c682bea15832f0f0dc75b45e151171f498db29820ad8a8ffcc5d98fedafdc66857f681cd3f1455dfa71b71065d82a25bb56f8c5e7a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUuZ/9AAoJEGVpnaTzz9K9AOsQAL7c+MRrfDhKXkqmZcPfPODc
-HZsQMikjGo4S4i3CS97asN9cgs4p7ZLZ2Is70sCDidjXtQLleyvZSvfi/8Gzj10n
-+qSkNxuLtBmF6Qfqd70B4+aTQBfMLUDpDzbrpOgWinsXapjRRzLyKKs7m8o+KTtD
-bWvs5HJUcisIKJEMuyr41L6pPXqRfTxngPd7+5FU+W+XPrnbyODlCMGAZJJmx8uL
-D05WpFHN/36pOqBbUKbc2Kr6scMvUmmIj1BBT28niIEcKzgO1NXr69ZJTo3Q7N1U
-HaTVcRuCImdarCGzqIYm5HzCYjv2WD0j44NEy5eJknM7xP7WM0hNyTce/8LcY8yg
-0o+1bsYRrDnyUezApHUaFEC5PHBmjP/1dtwlUhIWwvtcK1cXIIjfpbJ3B+IDmjGS
-zGMouCI1obTt9dKbwl1hi28EkH0VliPccY7oeB17Wb26AXI2k1/zAfNo9pFdm+OI
-UJ37GqXvBFTQS7C+8pW1BFCgskFJwZ3iqoz7sDOPqsn0ooV1kPadzEFUJNj+HEoW
-4YlKMH1haeAgTg+Ph1v8YljMhpJq2P75aU7d+HD1oxj2O1E/3aSFOMP+wkZ+pgtQ
-2QsN4TL0sDsqG2tHwo0b4bSGPaMUi/dRB2iIGWoGPd0w9b2Km5BRGulBZGxs5WHp
-JS5rr4Q66Ea4El0c5adJ
-=nIkZ
+iQIcBAEBCAAGBQJUyX5aAAoJEGVpnaTzz9K9FeUQAJ3oCwKmQgHzk63Btma4evUR
+7orqULBD8TBJ6Kwusn3fwMI7edaZnbKS8+jDFM77sO4yuHobmoiZrXLFzTgde4ZY
+tNrtSPWn08yy+lBwcwZd5LC2MVYIGXixsBuXxNRplCYNV+a3KsvDzO406fXZ0lJP
+BaAGqunTMffJvSpLFYwjNcvpgpVmucz+w0qmrPnl21EYCJKBsBH1s9w+EsFO3KYV
+O9wBqO8h29AalNUiUKg8kGPiufTVzSVwe1WajtbENI+7pPU1YKq1gFvW+29U0+Nm
+oay2BLVKTS4dI0unBmdqVvaGddbzY0G+eUdIseLv/C161ApKu8VMms0pkkpwseb9
+Xc4m1zYCBNglO3iLXtRd9UAn6uF/KPsW3gu7eJKFIzhQM1Y4YIV/WFb547bYqGb5
+evmfjJPfPRuwdTkzcs0Ux7B9QCW+MeXPE7O2UDVdGimw155MXcXPreTnGG7J5bUe
+v7pvYGcdphPef1/fwTT7Cf16nVdGkLyJZRl3v9rf7j1uaktDtq2HS0DZngT591fk
+DfVdbP9uD1A9PVFop+jUy3HPmAfkWp8D4ULsqGvnJNr0F4wrviWsMSCzuXoA8aQA
+BGAYXw9Lwo3dkUH2n+x4P4u6Va97zyWbDwJFhUBp66BzXV7RQn3VmBvUnfc8ePUa
+G0XYlpngDgaJ0/suZoSe
+=h4/r
 -----END PGP SIGNATURE-----
diff --git a/media-sound/tomahawk/tomahawk-0.8.2.ebuild b/media-sound/tomahawk/tomahawk-0.8.2.ebuild
index 405f28533227..9d3fdeef89d6 100644
--- a/media-sound/tomahawk/tomahawk-0.8.2.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.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/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.1 2015/01/16 23:34:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.2 2015/01/29 00:27:02 johu Exp $
 
 EAPI=5
 
@@ -30,7 +30,6 @@ REQUIRED_USE="telepathy? ( kde )"
 # - deps with missing qt4/qt5 use flags
 # - does not build with in-tree only deps
 DEPEND="
-	app-crypt/qca:2
 	dev-cpp/lucene++
 	dev-cpp/sparsehash
 	dev-libs/boost
@@ -43,6 +42,7 @@ DEPEND="
 	hatchet? ( dev-cpp/websocketpp )
 	jabber? ( net-libs/jreen )
 	!qt5? (
+		app-crypt/qca:2[qt4(+)]
 		>=dev-libs/libattica-0.4.0
 		dev-libs/qjson
 		dev-libs/qtkeychain[qt4]
@@ -57,6 +57,7 @@ DEPEND="
 		telepathy? ( net-libs/telepathy-qt[qt4] )
 	)
 	qt5? (
+		app-crypt/qca:2[qt5(+)]
 		dev-libs/qtkeychain[qt5]
 		dev-qt/designer:5
 		dev-qt/qtcore:5
@@ -69,7 +70,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	app-crypt/qca-ossl
+	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 "
 
 DOCS=( AUTHORS ChangeLog README.md )
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 76a2f17ba831..8af61e0c1223 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-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/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.28 2015/01/16 23:34:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.29 2015/01/29 00:27:02 johu Exp $
 
 EAPI=5
 
@@ -30,7 +30,6 @@ REQUIRED_USE="telepathy? ( kde )"
 # - deps with missing qt4/qt5 use flags
 # - does not build with in-tree only deps
 DEPEND="
-	app-crypt/qca:2
 	dev-cpp/lucene++
 	dev-cpp/sparsehash
 	dev-libs/boost
@@ -43,6 +42,7 @@ DEPEND="
 	hatchet? ( dev-cpp/websocketpp )
 	jabber? ( net-libs/jreen )
 	!qt5? (
+		app-crypt/qca:2[qt4]
 		>=dev-libs/libattica-0.4.0
 		dev-libs/qjson
 		dev-libs/qtkeychain[qt4]
@@ -57,6 +57,7 @@ DEPEND="
 		telepathy? ( net-libs/telepathy-qt[qt4] )
 	)
 	qt5? (
+		app-crypt/qca:2[qt5]
 		dev-libs/qtkeychain[qt5]
 		dev-qt/designer:5
 		dev-qt/qtcore:5
@@ -69,7 +70,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	app-crypt/qca-ossl
+	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 "
 
 DOCS=( AUTHORS ChangeLog README.md )