Adjust use dependencies to handle >=app-crypt/qca-2.1. Remove old.

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

6 files changed, 35 insertions, 283 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 068aaf02e8e7..ccc2b61173f8 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.474 2014/12/13 01:39:45 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.475 2015/01/29 00:09:40 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> -amarok-2.8.0-r1.ebuild,
+  -amarok-2.8.0-r2.ebuild, amarok-2.8.0-r3.ebuild, amarok-2.8.0.ebuild:
+  Adjust use dependencies to handle >=app-crypt/qca-2.1. Remove old.
 
   13 Dec 2014; Manuel Rüger <mrueg@gentoo.org> amarok-2.8.0-r3.ebuild:
   Add support for kde applications dependency.
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index a670c8c72ebd..f1a0a631906a 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,9 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX amarok-2.8.0-gmock-1.7.patch 1205 SHA256 3d780ba18dfda23eb19772dd803969a72b7bb47c5181060bdb18257cd16ce88b SHA512 6bbbdf633f65337523d023decd6b3ca889a2bf9b10e93d12f686e273144a58dd398813a99474adf8d35ad1184658f77626b040be288b44a9ac58424a51d05790 WHIRLPOOL a4c45a1386cd8f5c5b97e4fb6563b3e59de19de61d584669ee62f8884d5cafacdb746e6578b2e2f9adf20779ff059d758cea1686ced9c7392b1f9dd1b6ee5b87
 AUX amarok-2.8.0-mysqld-rpath.patch 602 SHA256 b8a10620877962ecd4fd4b3f466bb2418fdd3a17c4fa5b69a655978557996bfd SHA512 7e2b4581a49424d51b47073bcc45d976eb0195b8a87c02a6e012e85d7e771b9c207f351bf9571038b2d7cb3cecc8118d688e50b7faf4eb176d204b590b17ed2e WHIRLPOOL 8d1d5311b907f982d031ad7083771f7b081af7c1808da337ab0413ca50974dfa8f33b33bd30baa9e09ab3a4aa3996e15622b125de22b7150814a0d35f5b12d33
 DIST amarok-2.8.0.tar.bz2 39950028 SHA256 f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6 SHA512 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d WHIRLPOOL 108cfd95d65e74f28f85a846f605bc349e5b2962b7f9a357415225f3e48ff87148d7f50a642665cc3c809bb2cb4c22f339ad049cdeb4659bb7c0a48e798833ad
-EBUILD amarok-2.8.0-r1.ebuild 3778 SHA256 0e79975ed5ad8bb310bca486ded5655907cdc77db92101fc2161bcb836cfe147 SHA512 c032820d7be8fbce87298717ba8a0bc388863af08deeb322b262c5c56087c2f79517166a466c6b7f910b1261ce91e9840cbe27e155a7a4da7fb173326e34bee1 WHIRLPOOL aa2c227af9bb4262179fbdf6444887f0d27846f7b535a5af8dd6833f6912e8574c8111a834780ff7a2b8e0e14f892fb438c30d580656f0d16fe134407762fe11
-EBUILD amarok-2.8.0-r2.ebuild 3576 SHA256 2b1570bde2b3cc227737e2d1c194a90475e8764c5c5de0bf6c1ba467e44953b6 SHA512 e1bbbbf8f622e0e255173bcd07e47dc28cc5c2a9ca34f66e6b3f6d2fcbaf81f7e3cf44ad55527c85670168e871e50f3c41162c865eb51ad177052374938a0f13 WHIRLPOOL 8be04dc12737274e99bf6abf6d32a5e67ad57a25a2c7e4f159e0aa963ac3ffb92f5c5a4fe6e41bd44f1b828b387fd1c380ea3bf618631dd62749b96a84e6484c
-EBUILD amarok-2.8.0-r3.ebuild 3932 SHA256 911f051129430337fdcdbda7d00ef2c86c1f4c3a99fb08386e9fb971b6a4b829 SHA512 ade7f1dc037fc04a6554a81b0d20f3fa28c657799d2e43d570e374e8df74128c2e840010e1733c0214b8d3ba44a0534bb8dc7a9597309c04cec591c88a375e5c WHIRLPOOL 6d433e1ed9a2d0f3bc0951215be76617c1162fd0046c407fc638f7b05748528af6f68e935046d9f97f327ccd929d409f5b94242ede17c7414f82dc0692bc5e2c
-EBUILD amarok-2.8.0.ebuild 3586 SHA256 46501342da286ecdaf1f01397319d7b55d4e5cde599d939e42f64fbb72041377 SHA512 85aae1d88dd54190205c6ce47f96cfbedc9b5b5e7fc1f11582cd5997029952157a60965d4425d129e22fcffde0cd6cc6256d75eb5aeb13e20d5dc20b1fd0edfc WHIRLPOOL 7e5675648b6150d19312c3f1cd5ac4b0e9e38528548acf03a2b185e96c807098f0bb0d4ebf49d8e1a211be0c153ee61ab0623c82c5bbadc2e95cc2e8fb2c4be2
-MISC ChangeLog 80654 SHA256 62e66ccc1a8f380aa46cee7859ff8a9e193817e291474d2f754211cfae892fbd SHA512 96d1d13d35b6e813718ac52a2ae47cdd8925aaa631fb63e152c684e721a1a329265776369d26b728c275d340a8d530679a9d5f8ab26456f490a9e9e49bb5e87e WHIRLPOOL ffdf21574dda4f88f191a4d389c6179d651d91db76d4b08076f3c678c7a6b5143e2895867c51330f5af3d580135ce9a3a89c2806e5cde0cb6ffddb42df1a4681
+EBUILD amarok-2.8.0-r3.ebuild 3939 SHA256 3115eb96efc6564442ba14ea359ef4ee76f7d7383fc92f9d3a5f9e4b624a69d9 SHA512 d29b567c0a0f5697cf6d925e60bcd03e656627ac62b88918260221600032527dda7b0e60eaa73e1444fbae83f7a47d90c50a78845476862eb9d704f8c0990c2b WHIRLPOOL adf9afbb1eef72abde16c5462b29a646ffd4d8fc6b3acf8758c45e67340ce4351bde184f87d5554a37f9923ce1fb35bde17a28e8b1035e1747476d02d2edba86
+EBUILD amarok-2.8.0.ebuild 3592 SHA256 972c182d55ed96e1ba48673f29cbfa13995d593b187f4ee96b5874aa9f1a46c2 SHA512 4c45136cb9cb7a87fd17a249550c383b5b3c6e9928529f68ead13f7ad675ed4f09a3e28e359521ef86901eed7d61cf1ee8c6d4c2796f771719d0d3b08cb56836 WHIRLPOOL 7132ccc227ca33229edfba926271a770b36608aa057fa2b84843ad823bec368727ae892062dc73a54f36f87505c3f5cad451d1d4d16f7fda1976cb5feed4e366
+MISC ChangeLog 80868 SHA256 4f183c71bcec0cb78f2341b8d13aabf1872f25cb73604453ea843a46217300d5 SHA512 44aedc7556bfe20583d1fa4743e5b6f34abc0eb236ed0472339f9615a9b42608d3f779f04b0d00578debb8d97905f1b3272da347ac1aa695900a605dd785b72d WHIRLPOOL d7f19b7ffd547b588947393eb48c5cdbe1397c37f8d65dd8cc2f8c900b59dcfcff9555278a0d5b5cb3b0787b6576e3f0c2a72117f3201a9923dac170221f862e
 MISC metadata.xml 1064 SHA256 8e46a720b86b83508c2bf4a5a3be43bbdabb1bf8e057b547dc881912fea035e6 SHA512 d576c1e66b3e76e899f4580a908d41a0ad2faaae0346b47fe5e4d925763428e705be2fe7246f4109a4b470c6a75acd445215722fc3b3e82709af765d659e7705 WHIRLPOOL 9b1235b62922630dbb2968c62dda7cac97eddc48a4857232d6a0aa25abdb756dad474281d39f2e342e719adb9f6311a6004e3b629496975e8b82f68d4487f96e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUyXpFAAoJEGVpnaTzz9K9yZEP/jqw6yUvRdMlxyj8ZXX2UQ9c
+P9epL3pVSktqaY92j5zOnWQDDGSULyR77cyCulD9iI4bXdplfZpUZdKY6US46EEl
+Yuj5wO299tHcSqlwOVjJu0Fv62p3BsCj9W3b4Vt6PIEq1ogqR0LmjQ8GhHwFElo0
+RNWjaZAYAzbK9lovUfCY6daYXF+0cfFqaAzZta3OaLmLT4szGJ+rE1QoxuBox5+c
+75KnT3HYX2qnQ6y8UMrxb11CevUO0ICdojfGP0ynsTekjd4WM6G3/ouLldPHRLkU
+27G5g88xSiApC8Fr/CBGeAbct7UJgHsTcaoXtHueE3DI9fjVOdY6SLafMEa4EZEp
+HGm6UTlCAzjflRf9oGPRtVb5L67Wr0564IwWVYgSFsaxYn1MBX/OGWxuQ5tNfOVJ
+NUJ+uziO/6ZQ4GmydTkuPCSXqvrAgdGxvpPYcllkLie/Qqz6oV6AlUuQjylhrK8u
+XHS6Bnku2Y1ttazZhgvEPI4WG6Wa8kcP1hLMzJd0wyI5pqKWAhB1gLkVyPA0uFUZ
+02ExHoK9B7+6jzjUMsg4Uwa2eRYlmxtFx/qVIkq0Cs03CDk/Ge6UNRsqwoNbsg0Y
+6rijqh7UF6DWaEDD2e+6azJVp/5ZqF8AFitbXVoH+ymIwjGCTvs9BI8n+DG+krpV
++QfskzD3ON5X1qTUywaq
+=uakM
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.8.0-r1.ebuild b/media-sound/amarok/amarok-2.8.0-r1.ebuild
deleted file mode 100644
index 7b725f23d39c..000000000000
--- a/media-sound/amarok/amarok-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r1.ebuild,v 1.2 2014/08/10 21:03:34 slyfox Exp $
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	if [[ $PV == *[6-9][0-9]* ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	fi
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop test +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?' 4.8.4)
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep audiocd-kio)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3 )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		>=dev-qt/qtcore-4.8.4:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-	semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-PATCHES=( "${FILESDIR}/${P}-gmock-1.7.patch" )
-
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		mv doc/en_US doc/en || die
-		sed -e "s/en_US/en/" -i doc/CMakeLists.txt || die
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-
-	local mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-		$(cmake-utils_use_with ofa LibOFA)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# bug 481592
-	pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			elog "You built mysql with the minimal use flag, so it doesn't include the server."
-			elog "You won't be able to use the local mysql installation to store your amarok collection."
-			echo
-		fi
-	fi
-}
diff --git a/media-sound/amarok/amarok-2.8.0-r2.ebuild b/media-sound/amarok/amarok-2.8.0-r2.ebuild
deleted file mode 100644
index 0c98bb44e9ff..000000000000
--- a/media-sound/amarok/amarok-2.8.0-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r2.ebuild,v 1.3 2014/08/10 21:03:34 slyfox Exp $
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-KDE_MINIMAL="4.13.1"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	if [[ $PV == *[6-9][0-9]* ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	fi
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp nepomuk ofa opengl test +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	$(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep audiocd-kio)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3 )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		>=dev-qt/qtcore-4.8.4:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	nepomuk? ( >=kde-base/nepomuk-core-4.9.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-PATCHES=( "${FILESDIR}/${P}-gmock-1.7.patch" )
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-
-	local mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=OFF
-		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-		$(cmake-utils_use_with ipod)
-		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with lastfm LibLastFm)
-		$(cmake-utils_use_with mtp)
-		$(cmake-utils_use_with mp3tunes MP3Tunes)
-		$(cmake-utils_use_with nepomuk)
-		$(cmake-utils_use_with nepomuk Soprano)
-		$(cmake-utils_use_with ofa LibOFA)
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# bug 481592
-	pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			elog "You built mysql with the minimal use flag, so it doesn't include the server."
-			elog "You won't be able to use the local mysql installation to store your amarok collection."
-			echo
-		fi
-	fi
-}
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
index ba405477f714..395b8cdfb41e 100644
--- a/media-sound/amarok/amarok-2.8.0-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.0-r3.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/media-sound/amarok/amarok-2.8.0-r3.ebuild,v 1.4 2014/12/13 01:39:45 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild,v 1.5 2015/01/29 00:09:40 johu Exp $
 
 EAPI=5
 
@@ -37,7 +37,7 @@ fi
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	app-crypt/qca:2
+	app-crypt/qca:2[qt4(+)]
 	$(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
 	|| ( kde-apps/kdebase-kioslaves:4
 		$(add_kdebase_dep kdebase-kioslaves) )
diff --git a/media-sound/amarok/amarok-2.8.0.ebuild b/media-sound/amarok/amarok-2.8.0.ebuild
index 4ffa4f43c85f..5fa5313bb3a8 100644
--- a/media-sound/amarok/amarok-2.8.0.ebuild
+++ b/media-sound/amarok/amarok-2.8.0.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/media-sound/amarok/amarok-2.8.0.ebuild,v 1.7 2014/08/10 21:03:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0.ebuild,v 1.8 2015/01/29 00:09:40 johu Exp $
 
 EAPI=5
 
@@ -36,7 +36,7 @@ fi
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	app-crypt/qca:2
+	app-crypt/qca:2[qt4(+)]
 	>=app-misc/strigi-0.5.7
 	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)