Version bump, remove old

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

3 files changed, 31 insertions, 31 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 2bcbfe30eb1b..2a02e24f4b7e 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.408 2011/06/01 19:49:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.409 2011/08/01 10:59:27 tampakrap Exp $
+
+*amarok-2.4.3 (01 Aug 2011)
+
+  01 Aug 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  -amarok-2.4.0.90.ebuild, +amarok-2.4.3.ebuild:
+  Version bump, remove old
 
   01 Jun 2011; Brent Baude <ranger@gentoo.org> amarok-2.4.0.ebuild:
   Marking amarok-2.4.0 ppc stable for bug 354033
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 0adb2b31509f..24a4db3d48c6 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -3,12 +3,12 @@ AUX amarok-2.3.2-flac-fix.patch 1233 RMD160 ee3f98e2ccbd14798c2b75ed6def2d1709ea
 AUX amarok-2.4.0.90-fix-plugin-detection.patch 623 RMD160 897a669e6a26e2559e713004849c19b7bd7f1033 SHA1 c6915369c3ecbceac7a8c5b8246f485fb760c2f4 SHA256 aae0ceca58b36ae714516fe46f1a4011836a3e3256a7efd106fdb8568e1fdbcf
 AUX amarok-fix-upnp-dep.patch 1896 RMD160 e0542160a01bde718555ac06bf7759fdc4078cf6 SHA1 d7a4e359bb13dde781605786d1f20017c5687a7b SHA256 e88481548d77d334adb51250ee2e70186249ee51164f060382a7b1ee2c6839d6
 DIST amarok-2.3.2.tar.bz2 13948250 RMD160 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390 SHA1 594d6d3ad57832fb80ba4387459356132d37ace2 SHA256 842569da06b4ebfc334f3530a77f900ea30b3b8968698bda8082b4b991488237
-DIST amarok-2.4.0.90.tar.bz2 15190982 RMD160 9243c6d1be194829fa5ef21fa970457343ebf109 SHA1 c71d7fd28d42030ca887c7f24655ac4a47956c5a SHA256 4379d9f7b960ff2045f47c14b3866ca298e98c4bad82fe84fea08e52320ccb2a
 DIST amarok-2.4.0.tar.bz2 15219572 RMD160 f32a664521b9827ef8e7d49100e39b69fa87dd29 SHA1 d37ecda0fecdba88bb239f11c6d4ff885d7ac23f SHA256 52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c
 DIST amarok-2.4.1.tar.bz2 15246413 RMD160 090a9a024701baf7e08fb8c63374156beb284b5d SHA1 1b1180e7799ff1314ee5a6409a612ede37ce8394 SHA256 0d4e516101c0e37e6dbc8b5a05c68c5fa04473d91fa16dd021b3891582a25d65
+DIST amarok-2.4.3.tar.bz2 17468203 RMD160 02026c400025e944c69f31b29013c8054a2575d2 SHA1 8a46fca6a550a4ca403a9be7f595728c819641c4 SHA256 6ce448ecd30cc3d45211617636904e3662c2082441b79ca1e36685c8b0be8208
 EBUILD amarok-2.3.2-r1.ebuild 4427 RMD160 3ab4b38f359a865586962bf4e740c52bb832fb9d SHA1 8b90eeea7d04d838b51865c3dde7edb6a021d040 SHA256 78dbacbc22a749251080c8c996c54a408e1040f3e49f9ccfc0ad5f9cab28a7fb
-EBUILD amarok-2.4.0.90.ebuild 4423 RMD160 4ba9bf28bfc6841db5a5d8b499b5f200588ef237 SHA1 2fd07d049f788dbcb1c446ede65681c9323f4582 SHA256 1b500fdb6594ef46709ed499483ddacf7b96a58a172861422b92ccd4ba5e4d37
 EBUILD amarok-2.4.0.ebuild 3985 RMD160 df3814894273557a9514ae0a7f902a9dffff7b2e SHA1 c598337cc68ff9091cc4109fd0e4afba53535f3f SHA256 576d5136914d5c60cae7286669311a7d1e53c94c3cc3e877ecc7455c1cc1fb7e
 EBUILD amarok-2.4.1.ebuild 4374 RMD160 ca44e603febbeb8ca5ec62bc8d79dfc079e225b5 SHA1 7beb6caf087704f08e6f7a7bdb2b9e062079faf8 SHA256 678ac81d6ab4c6407f199f087e4d1fabd29bbf9fdefca8e1ba085f5556113b65
-MISC ChangeLog 70056 RMD160 1678d8197750c10b7acaa85351d711ab33728cca SHA1 d961315b24d227baf97ab3d2bd3ebbd2e0cbe3c8 SHA256 35f745339364414024fbcd26b5fabc131cc236c46b67164ae9ed5daac33c056b
+EBUILD amarok-2.4.3.ebuild 4033 RMD160 33598e2ed9ce9e477c68292d6266af2dcfae201d SHA1 56c7f06118d90cf6bd32662a2769aa89ae7cd9f5 SHA256 e6b5c1091bd4504e48c86e373b48392baa2c1ec20b5b26ffbe467d71166b388d
+MISC ChangeLog 70221 RMD160 9dcf0acd48746a1563c319907581a0524b8b7587 SHA1 83ff7a1e033581b57fb6583a8477fd9c5cd31321 SHA256 ceafd7aa1dc3586668029b4e4a8fdc729a37afd36268a98e866db23078a5ddbc
 MISC metadata.xml 1566 RMD160 1ba975766c2e4e1cb5b162bf97e534c78a638e6b SHA1 6e0705052a0f430b39e693a4a7d722299a4d46c7 SHA256 c034e203d562fb1ac92d0d48436f64d3a36d04a3dadd15c5f7eec73d9298bd71
diff --git a/media-sound/amarok/amarok-2.4.0.90.ebuild b/media-sound/amarok/amarok-2.4.3.ebuild
index 06b94c0db33e..280330dd5ef0 100644
--- a/media-sound/amarok/amarok-2.4.0.90.ebuild
+++ b/media-sound/amarok/amarok-2.4.3.ebuild
@@ -1,29 +1,27 @@
 # 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.90.ebuild,v 1.5 2011/05/08 16:21:45 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3.ebuild,v 1.1 2011/08/01 10:59:27 tampakrap 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/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	KDE_SCM="git"
-	KEYWORDS=""
-fi
+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 ~ppc64 ~x86"
+else
+	KEYWORDS=""
+fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda daap debug +embedded handbook ipod lastfm mp3tunes mtp opengl playdar +player semantic-desktop upnp +utils"
+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
@@ -38,7 +36,7 @@ COMMONDEPEND="
 		>=app-misc/strigi-0.5.7[dbus,qt4]
 		$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
 		sys-libs/zlib
-		>=virtual/mysql-5.1[embedded?]
+		>=virtual/mysql-5.1
 		x11-libs/qt-script
 		>=x11-libs/qtscriptgenerator-0.1.0
 		cdda? (
@@ -46,6 +44,12 @@ COMMONDEPEND="
 			$(add_kdebase_dep libkcompactdisc)
 			$(add_kdebase_dep kdemultimedia-kioslaves)
 		)
+		embedded? (
+			|| (
+				>=dev-db/mysql-5.1.50-r3[embedded]
+				>=dev-db/mariadb-5.1.50[embedded]
+			)
+		)
 		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 		lastfm? ( >=media-libs/liblastfm-0.3.0 )
 		mp3tunes? (
@@ -58,8 +62,6 @@ COMMONDEPEND="
 		)
 		mtp? ( >=media-libs/libmtp-1.0.0 )
 		opengl? ( virtual/opengl )
-		playdar? ( dev-libs/qjson )
-		upnp? ( kde-misc/kio-upnp-ms )
 	)
 	utils? (
 		x11-libs/qt-core
@@ -76,13 +78,6 @@ RDEPEND="${COMMONDEPEND}
 	player? ( $(add_kdebase_dep phonon-kde) )
 "
 
-# Upstream patch to fix the plugin detection on startup
-# https://projects.kde.org/projects/extragear/multimedia/amarok/repository/revisions/37eda947bd8181a73ad0fffc88e66c25ddd69f28
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-upnp-dep.patch"
-	"${FILESDIR}/${P}-fix-plugin-detection.patch"
-)
-
 src_prepare() {
 	if ! use player; then
 		# Disable po processing
@@ -100,6 +95,7 @@ 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=(
@@ -111,8 +107,6 @@ src_configure() {
 			$(cmake-utils_use_with lastfm LibLastFm)
 			$(cmake-utils_use_with mtp)
 			$(cmake-utils_use_with mp3tunes MP3Tunes)
-			$(cmake-utils_use_with playdar QJSON)
-			$(cmake-utils_use_with upnp HUpnp)
 		)
 	else
 		mycmakeargs=(
@@ -150,7 +144,7 @@ pkg_postinst() {
 			elog "to configure the external db and migrate your data from the embedded database."
 			echo
 
-			if has_version "virtual/mysql[minimal]"; then
+			if has_version "dev-db/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