Remove old. Migrate to virtual/pkgconfig.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

8 files changed, 27 insertions, 598 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index b0944e5ed2a3..36e2ece55fc2 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.422 2012/04/17 16:10:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.423 2012/05/04 13:54:38 johu Exp $
+
+  04 May 2012; Johannes Huber <johu@gentoo.org> -amarok-2.4.0.ebuild,
+  -amarok-2.4.3.ebuild, -amarok-2.5.0-r1.ebuild, -amarok-2.5.0.ebuild,
+  amarok-2.4.3-r1.ebuild, amarok-2.5.0-r2.ebuild:
+  Remove old. Migrate to virtual/pkgconfig.
 
   17 Apr 2012; Brent Baude <ranger@gentoo.org> amarok-2.4.3-r1.ebuild:
   Marking amarok-2.4.3-r1 ppc for bug 389997
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 322733325e9d..8bb038200c6d 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,16 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX amarok-2.3.2-fix-qt-regression.patch 2958 RMD160 810ddadf7fa226302b75aaaf6945a19fe57472d2 SHA1 4f5c730f989c1f5aab57af72a9540223698bd7e1 SHA256 2f2a77552a06e6ec30106d8cb1f012f3f4213ac3354e64c7fe7f6933deb6d6ab
 AUX amarok-2.3.2-flac-fix.patch 1233 RMD160 ee3f98e2ccbd14798c2b75ed6def2d1709ead21e SHA1 3a4cb3edd6dc1a14410d3f13b6c9a7c0019c1a17 SHA256 f68f3c9b4fb8be02a37ac21d535d417b8fa6167d123e6e13e98c26fb758e40f1
 AUX amarok-2.4.0.90-fix-plugin-detection.patch 623 RMD160 897a669e6a26e2559e713004849c19b7bd7f1033 SHA1 c6915369c3ecbceac7a8c5b8246f485fb760c2f4 SHA256 aae0ceca58b36ae714516fe46f1a4011836a3e3256a7efd106fdb8568e1fdbcf
 AUX amarok-2.5.0-kde48.patch 2111 RMD160 4ebc2ddfc620cd1ea3d50cc250facb307b306e41 SHA1 8ec7be87e3f6d609e555a2149674f081316f9e28 SHA256 4ee6b27d79d42e7fbb5469f46c3ebaf69eef73ff83cb0882e44f4d993ba0ce51
 AUX amarok-fix-upnp-dep.patch 1896 RMD160 e0542160a01bde718555ac06bf7759fdc4078cf6 SHA1 d7a4e359bb13dde781605786d1f20017c5687a7b SHA256 e88481548d77d334adb51250ee2e70186249ee51164f060382a7b1ee2c6839d6
-DIST amarok-2.4.0.tar.bz2 15219572 RMD160 f32a664521b9827ef8e7d49100e39b69fa87dd29 SHA1 d37ecda0fecdba88bb239f11c6d4ff885d7ac23f SHA256 52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c
 DIST amarok-2.4.3.tar.bz2 17468203 RMD160 02026c400025e944c69f31b29013c8054a2575d2 SHA1 8a46fca6a550a4ca403a9be7f595728c819641c4 SHA256 6ce448ecd30cc3d45211617636904e3662c2082441b79ca1e36685c8b0be8208
 DIST amarok-2.5.0.tar.bz2 46607238 RMD160 4506d4b4b1b11378d25ad488f3bdba54cd9b7567 SHA1 9849900d20225e703c43d242650a8fa211cf15f2 SHA256 1ed191db290fdede7c910c322cff2aba8ecfc1c4af891508d9ee410db3768849
-EBUILD amarok-2.4.0.ebuild 4023 RMD160 a083182d5ef0a4a6bf3fb06f3a2ce94ab12b655c SHA1 c8c363ac52361fb9345450304a63f14a98f9e991 SHA256 d36c21adcf3aa887d63d1b560b3ffa959cc9935f7e630189f6eee9288a96c836
-EBUILD amarok-2.4.3-r1.ebuild 3261 RMD160 7bac9e20b2bc6cd3adc1ea36673f8cce1c7c60b3 SHA1 2de9707692e8def0f84bdc33818954c2e8f995b4 SHA256 0d94bd2a7e8ccdd7cbd3098840fcf12927d5f3498cae0ba88bd6a32ec8554584
-EBUILD amarok-2.4.3.ebuild 3955 RMD160 78427979a79b632f66b393ad48cfb7b9ab8063c6 SHA1 5a9087c9925619bc18266581ddb1726c0d724663 SHA256 77deb37a4070986ee193269fd25622b1dce97d9b2991fac9bef523d04ab6fa42
-EBUILD amarok-2.5.0-r1.ebuild 4039 RMD160 89ecb72828bd23f3069d288c036c2ea8f1295be9 SHA1 8919bb00a3657a423c8a8a7c3f0e518f7c3c0b89 SHA256 da7b3bc05636b90126ba28e4d0e89bbad553429a2bb5a3617c76e177464947a0
-EBUILD amarok-2.5.0-r2.ebuild 4084 RMD160 566be119703e6b11516583a46a62defc5b2646f5 SHA1 5f10d5f2e85154cdfbc391070fc1d4f1ad9eb472 SHA256 39d8b24436fa8b552641a3132545f6f18f4fb89262781c342189e04a9e7f3d1e
-EBUILD amarok-2.5.0.ebuild 3961 RMD160 9ca6c640799a9697ea3e86b0a561e7787b14688e SHA1 9a7cef7b24d85eef617b2a67e1bfb69c527d8f4e SHA256 8799d70ae5340af5b974493363fd71863794b2d0107d1a2a8d900b6bb84d3a1e
-MISC ChangeLog 72299 RMD160 08112d9eeaaf3eb159747bd32b3b5b41fcd0f53d SHA1 44242c92a17ffcdf16a05beb389c7615dc25e801 SHA256 527c1e74d442b9b127661501094a43ac646d025659324a07fd1ae74e231b9950
+EBUILD amarok-2.4.3-r1.ebuild 3258 RMD160 a46f02e29766d49d0319902bcb58e58e964257e7 SHA1 9c4cedf4096b1299d74310459240b2fd0a5f0817 SHA256 a0ab77e17a1d1fb62fd0bda3ee502af805f4a16becebe16ef9f4eec2640f3c47
+EBUILD amarok-2.5.0-r2.ebuild 4083 RMD160 d86ad4d2814e0a746e5598185363b91a974249e5 SHA1 8eaafa147d04058d958f1ff043af5812633244e6 SHA256 2e5c6f87013b08b6718fcd1c98ca254ea5982cd7b65a43f6c7d57a7ae7553680
+MISC ChangeLog 72533 RMD160 df26fbfe3ffc2a6c111d7696397bd553d1666d7a SHA1 579d07be5d7426777aeceb058dc5509a68588bf5 SHA256 892b3836e3d21c13e61ca42db28b05a572d11c29af27ca95c77cd4ebbfaf729f
 MISC metadata.xml 1739 RMD160 33e05987cb92cbe2d842d2570f14c2832d32c450 SHA1 7200789e72e26ccaabb97051b678ca528040b821 SHA256 d817903b822caa41353f1a32b8e6db9c84c86b824a1e5934ca1051f4fe297fed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPo9+eAAoJEO+t9ga+3I3aOCQIAIgTj0diFKjhVzO4s+KUPnUK
+cMBmsBCjv48Qk1zGv8+JJwCR4a2Zk+iy2g+4SDQJem0xW9zX5gpugsVcLUCwqX4q
+zwD+5h/vM/CL0NMxQ5zMbGdKO8ErLdPOx5qcY+J6H5lOxQ2azkVZiGfKcT0LHPmi
+4kd3DvpLmk2sKOVzt2Mr7ZMvWAet6XQKw1BwCR0Snl+JgCJAiOOx7dTqJSMygrqM
+nepJTIyP4PYkKp/9gAnb8N/FNq1rxXfvNYxh3s1wRO8Ui6v2hZveK/gmw1uRRHxL
+PZ+WtHBP3rT0+LinxFqtG0uqLXLzOtiY3/kO9FLdwfihWvSlJzn1eopl29DCxU0=
+=5rTS
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.4.0.ebuild b/media-sound/amarok/amarok-2.4.0.ebuild
deleted file mode 100644
index ca38a051c7b9..000000000000
--- a/media-sound/amarok/amarok-2.4.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v 1.10 2011/12/20 09:22:09 jmbsvicetto Exp $
-
-EAPI="3"
-
-# Translations are only in the tarballs, not the git repo
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl
-	pa pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc x86"
-else
-	KDE_SCM="git"
-	KEYWORDS=""
-fi
-
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded handbook ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	player? (
-		app-crypt/qca:2
-		>=app-misc/strigi-0.5.7[dbus,qt4]
-		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-		$(add_kdebase_dep kdebase-kioslaves)
-		sys-libs/zlib
-		>=virtual/mysql-5.1[embedded?]
-		x11-libs/qt-script
-		>=x11-libs/qtscriptgenerator-0.1.0
-		cdda? (
-			$(add_kdebase_dep libkcddb)
-			$(add_kdebase_dep libkcompactdisc)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
-		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-		lastfm? ( >=media-libs/liblastfm-0.3.0 )
-		mp3tunes? (
-			dev-libs/glib:2
-			dev-libs/libxml2
-			dev-libs/openssl
-			net-libs/loudmouth
-			net-misc/curl
-			x11-libs/qt-core[glib]
-		)
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		opengl? ( virtual/opengl )
-	)
-	utils? (
-		x11-libs/qt-core
-		x11-libs/qt-dbus
-	)
-	!player? ( !utils? ( media-sound/amarok[player] ) )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	dev-util/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	player? ( $(add_kdebase_dep phonon-kde) )
-"
-
-src_prepare() {
-	if ! use player; then
-		# Disable po processing
-		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-		sed -e "s:macro_optional_add_subdirectory( po )::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-
-	if use player; then
-		mycmakeargs=(
-			-DWITH_PLAYER=ON
-			-DWITH_Libgcrypt=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)
-		)
-	else
-		mycmakeargs=(
-			-DWITH_PLAYER=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-		# $(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with semantic-desktop Soprano)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use player; then
-
-		if use daap; then
-			echo
-			elog "You have installed amarok with daap support."
-			elog "You may be interested in installing www-servers/mongrel as well."
-			echo
-		fi
-
-		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://amaroklive.com/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
-	fi
-}
diff --git a/media-sound/amarok/amarok-2.4.3-r1.ebuild b/media-sound/amarok/amarok-2.4.3-r1.ebuild
index 31e58e396469..466593b6e6c1 100644
--- a/media-sound/amarok/amarok-2.4.3-r1.ebuild
+++ b/media-sound/amarok/amarok-2.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3-r1.ebuild,v 1.4 2012/04/17 16:10:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3-r1.ebuild,v 1.5 2012/05/04 13:54:38 johu Exp $
 
 EAPI=4
 
@@ -59,7 +59,7 @@ COMMONDEPEND="
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
-	dev-util/pkgconfig
+	virtual/pkgconfig
 "
 RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep phonon-kde)
diff --git a/media-sound/amarok/amarok-2.4.3.ebuild b/media-sound/amarok/amarok-2.4.3.ebuild
deleted file mode 100644
index 1e2ce7eaf571..000000000000
--- a/media-sound/amarok/amarok-2.4.3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3.ebuild,v 1.8 2012/04/16 21:14:35 ranger Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
-pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	player? (
-		app-crypt/qca:2
-		>=app-misc/strigi-0.5.7
-		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-		$(add_kdebase_dep kdebase-kioslaves)
-		sys-libs/zlib
-		>=virtual/mysql-5.1[embedded?]
-		x11-libs/qt-script
-		>=x11-libs/qtscriptgenerator-0.1.0
-		cdda? (
-			$(add_kdebase_dep libkcddb)
-			$(add_kdebase_dep libkcompactdisc)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
-		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-		lastfm? ( >=media-libs/liblastfm-0.3.0 )
-		mp3tunes? (
-			dev-libs/glib:2
-			dev-libs/libxml2
-			dev-libs/openssl
-			net-libs/loudmouth
-			net-misc/curl
-			x11-libs/qt-core[glib]
-		)
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		opengl? ( virtual/opengl )
-	)
-	utils? (
-		x11-libs/qt-core
-		x11-libs/qt-dbus
-	)
-	!player? ( !utils? ( media-sound/amarok[player] ) )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	dev-util/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	player? ( $(add_kdebase_dep phonon-kde) )
-"
-
-src_prepare() {
-	if ! use player; then
-		# Disable po processing
-		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-		sed -e "s:macro_optional_add_subdirectory( po )::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-	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
-
-	if use player; then
-		mycmakeargs=(
-			-DWITH_PLAYER=ON
-			-DWITH_Libgcrypt=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)
-		)
-	else
-		mycmakeargs=(
-			-DWITH_PLAYER=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-		# $(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with semantic-desktop Soprano)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use player; then
-
-		if use daap; then
-			echo
-			elog "You have installed amarok with daap support."
-			elog "You may be interested in installing www-servers/mongrel as well."
-			echo
-		fi
-
-		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://amaroklive.com/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
-	fi
-}
diff --git a/media-sound/amarok/amarok-2.5.0-r1.ebuild b/media-sound/amarok/amarok-2.5.0-r1.ebuild
deleted file mode 100644
index 6e769a4599b5..000000000000
--- a/media-sound/amarok/amarok-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r1.ebuild,v 1.2 2011/12/31 05:56:08 jmbsvicetto Exp $
-
-EAPI=4
-
-KDE_LINGUAS="af ar ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et
-eu fa fi fr ga gl he hr hu is it ja km ko ku lt lv mai ml ms nb nds ne nl nn
-oc pa pl pt pt_BR ro ru se si sk sl sq sr sr@ijekavian sr@ijekavianlatin
-sr@Latn sv tg th tr ug uk wa zh_CN zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	x11-libs/qt-script
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep kdemultimedia-kioslaves)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-0.3.0 )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		x11-libs/qt-core[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	dev-util/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	$(add_kdebase_dep phonon-kde)
-	!media-sound/amarok-utils
-"
-
-src_prepare() {
-	# en locale is special in a way that it is always enabled. English Amarok
-	# handbook however lies in the doc/en_US folder and thus is not picked
-	# up by kde4-functions eclass. Rename it.
-	sed -e 's:add_subdirectory(en_US):add_subdirectory(en):' \
-		-i "${S}/doc/CMakeLists.txt" \
-		|| die "Replacing en_US by en in doc/CMakeLists.txt failed."
-	mv "${S}/doc/en_US" "${S}/doc/en" || die "Moving doc/en_US to doc/en failed."
-
-	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
-
-	# Mygpo-qt not yet in portage, add IUSE when available
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_Mygpo-qt=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)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-		# $(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with semantic-desktop Soprano)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use daap; then
-		echo
-		elog "You have installed amarok with daap support."
-		elog "You may be interested in installing www-servers/mongrel as well."
-		echo
-	fi
-
-	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.5.0-r2.ebuild b/media-sound/amarok/amarok-2.5.0-r2.ebuild
index ea46e901bb15..28848ee80a6e 100644
--- a/media-sound/amarok/amarok-2.5.0-r2.ebuild
+++ b/media-sound/amarok/amarok-2.5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r2.ebuild,v 1.1 2012/02/09 16:54:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r2.ebuild,v 1.2 2012/05/04 13:54:38 johu Exp $
 
 EAPI=4
 
@@ -62,7 +62,7 @@ COMMONDEPEND="
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
-	dev-util/pkgconfig
+	virtual/pkgconfig
 "
 RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep phonon-kde)
diff --git a/media-sound/amarok/amarok-2.5.0.ebuild b/media-sound/amarok/amarok-2.5.0.ebuild
deleted file mode 100644
index eeed0ea69aca..000000000000
--- a/media-sound/amarok/amarok-2.5.0.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0.ebuild,v 1.1 2011/12/20 09:22:10 jmbsvicetto Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
-pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	player? (
-		app-crypt/qca:2
-		>=app-misc/strigi-0.5.7
-		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
-		$(add_kdebase_dep kdebase-kioslaves)
-		sys-libs/zlib
-		>=virtual/mysql-5.1[embedded?]
-		x11-libs/qt-script
-		>=x11-libs/qtscriptgenerator-0.1.0
-		cdda? (
-			$(add_kdebase_dep libkcddb)
-			$(add_kdebase_dep libkcompactdisc)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
-		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-		lastfm? ( >=media-libs/liblastfm-0.3.0 )
-		mp3tunes? (
-			dev-libs/glib:2
-			dev-libs/libxml2
-			dev-libs/openssl
-			net-libs/loudmouth
-			net-misc/curl
-			x11-libs/qt-core[glib]
-		)
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		opengl? ( virtual/opengl )
-	)
-	utils? (
-		x11-libs/qt-core
-		x11-libs/qt-dbus
-	)
-	!player? ( !utils? ( media-sound/amarok[player] ) )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	dev-util/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	player? ( $(add_kdebase_dep phonon-kde) )
-"
-
-src_prepare() {
-	if ! use player; then
-		# Disable po processing
-		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-		sed -e "s:macro_optional_add_subdirectory( po )::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-	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
-
-	if use player; then
-		mycmakeargs=(
-			-DWITH_PLAYER=ON
-			-DWITH_Libgcrypt=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)
-		)
-	else
-		mycmakeargs=(
-			-DWITH_PLAYER=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-		# $(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with semantic-desktop Soprano)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use player; then
-
-		if use daap; then
-			echo
-			elog "You have installed amarok with daap support."
-			elog "You may be interested in installing www-servers/mongrel as well."
-			echo
-		fi
-
-		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
-	fi
-}