version bump; clenaups

Package-Manager: portage-2.0.51.19

9 files changed, 32 insertions, 134 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index a2b2ccc1af4d..9d5cfa69db60 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.52 2005/04/07 15:50:59 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.53 2005/05/21 17:34:29 lanius Exp $
+
+*amarok-1.2.4 (21 May 2005)
+
+  21 May 2005; Heinrich Wendel <lanius@gentoo.org> -amarok-1.2.ebuild,
+  -amarok-1.2.1.ebuild, -amarok-1.2.2.ebuild, amarok-1.2.3.ebuild,
+  +amarok-1.2.4.ebuild:
+  version bump, cleanups
+
+  14 May 2005; Heinrich Wendel <lanius@gentoo.org> amarok-1.2.3.ebuild:
+  stable on amd64 and x86
 
   07 Apr 2005; Simon Stelling <blubb@gentoo.org> amarok-1.2.1.ebuild:
   stable on amd64
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 2ef5ab10dbec..4d1de88d6ce1 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,16 +1,22 @@
-MD5 e772f3423f4fa3231ecde7d362369771 ChangeLog 7879
-MD5 8dec94b33db41952f96628c1948fa301 amarok-1.0.2.ebuild 1199
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 8ab1d316a1506fe1ecff05ba7f6cf8cb amarok-1.1.1.ebuild 1578
-MD5 701a98ddaf53b04007c5d92d5c6ca191 amarok-1.2.1.ebuild 1680
-MD5 87a75e16933d92c4cfccef6fedf4d000 amarok-1.2.2.ebuild 2471
-MD5 018c1cd00abeacfdc4f2d648b78efd21 amarok-1.2.ebuild 1681
+MD5 07bb963c1b5f7bb9fd4a271e8c53c59c amarok-1.2.4.ebuild 2341
+MD5 8dec94b33db41952f96628c1948fa301 amarok-1.0.2.ebuild 1199
+MD5 a258f28c227f6608e1a60bb1f13c1bea amarok-1.2.3.ebuild 2339
+MD5 160ef94fb0b505ed0688f6d13095fc25 ChangeLog 8196
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
-MD5 70d6091b143a9166be200b9915f4c62e amarok-1.2.3.ebuild 2341
-MD5 8af9e3314d69ebb6341e75b5a1ead176 files/amarok-1.0-cjk-a.diff 1532
 MD5 13f06732c7435e60cc160fdd9bdc293a files/amarok-1.2.2-contextbrowser-cpu-fix.patch 5191
+MD5 8af9e3314d69ebb6341e75b5a1ead176 files/amarok-1.0-cjk-a.diff 1532
 MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
 MD5 33697f318e63c60a1ec8082330eece7f files/digest-amarok-1.1.1 66
-MD5 29fa546c14f7d1c0498727a37e1468c0 files/digest-amarok-1.2 64
-MD5 2a078f136cadb54f32bd6531ef66e218 files/digest-amarok-1.2.1 66
-MD5 b9f7fa7da92d9361c1effc82b09ebe07 files/digest-amarok-1.2.2 66
 MD5 55c15fa0003bd71db5f7e23d750c0b16 files/digest-amarok-1.2.3 66
+MD5 9966964d087dd7c05b7fa2efeff9b1ac files/digest-amarok-1.2.4 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCj3HUevY57Fted3ERAs8cAJ9fmnVd7G4agH5zHAVP701OIKEZgACcDdT0
+gwYxBWTu2XqtNFHTU6ytDkU=
+=tG0O
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.2.1.ebuild b/media-sound/amarok/amarok-1.2.1.ebuild
deleted file mode 100644
index 52f5303fc430..000000000000
--- a/media-sound/amarok/amarok-1.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.1.ebuild,v 1.3 2005/04/07 15:50:59 blubb Exp $
-
-inherit kde eutils
-
-DESCRIPTION="amaroK - the audio player for KDE"
-HOMEPAGE="http://amarok.kde.org/"
-SRC_URI="mirror://sourceforge/amarok/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="noamazon xmms opengl xine kde arts gstreamer mysql"
-# kde: enables compilation of the konqueror sidebar plugin
-
-KEYWORDS="amd64 ~ppc -sparc x86"
-
-#	Not yet released:
-#	">=media-libs/libvisual-0.2.0
-RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
-	 arts? ( kde-base/arts
-		 || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia )
-		 || ( kde-base/akode kde-base/kdemultimedia ) )
-	 opengl? ( virtual/opengl )
-	 xmms? ( >=media-sound/xmms-1.2 )
-	 xine? ( >=media-libs/xine-lib-1_rc4 )
-	 >=media-libs/tunepimp-0.3.0
-	 >=media-libs/taglib-1.3.1
-	 gstreamer? ( >=media-libs/gst-plugins-0.8.6
-	 	      >=media-plugins/gst-plugins-mad-0.8.6 )
-	 mysql? ( >=dev-db/mysql-4 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.2
-
-pkg_setup() {
-	if use !xine && use !arts && use !gstreamer
-	then
-		die "You must enable either aRts or Xine or GStreamer"
-	fi
-}
-
-src_compile() {
-	# amarok does not respect kde coding standards, and makes a lot of
-	# assuptions regarding its installation directory. For this reason,
-	# it must be installed in the KDE install directory.
-	PREFIX="`kde-config --prefix`"
-
-	myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer) $(use_enable mysql) \
-		$(use_with opengl) $(use_enable !noamazon amazon)"
-
-	kde_src_compile
-}
diff --git a/media-sound/amarok/amarok-1.2.3.ebuild b/media-sound/amarok/amarok-1.2.3.ebuild
index d300d2090ceb..da7e5b25d97a 100644
--- a/media-sound/amarok/amarok-1.2.3.ebuild
+++ b/media-sound/amarok/amarok-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.3.ebuild,v 1.2 2005/04/03 19:25:04 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.3.ebuild,v 1.3 2005/05/21 17:34:29 lanius Exp $
 
 inherit kde eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/amarok/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
+KEYWORDS="amd64 ~ppc -sparc x86"
 IUSE="arts flac gstreamer kde mad mysql noamazon oggvorbis opengl xine xmms visualization"
 # kde: enables compilation of the konqueror sidebar plugin
 
diff --git a/media-sound/amarok/amarok-1.2.2.ebuild b/media-sound/amarok/amarok-1.2.4.ebuild
index d9075cfc408f..11bbea9ba023 100644
--- a/media-sound/amarok/amarok-1.2.2.ebuild
+++ b/media-sound/amarok/amarok-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.2.ebuild,v 1.1 2005/03/18 16:49:44 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.4.ebuild,v 1.1 2005/05/21 17:34:29 lanius Exp $
 
 inherit kde eutils
 
@@ -39,7 +39,7 @@ need-kde 3.2
 
 pkg_setup() {
 	if use arts && ! use xine && ! use gstreamer; then
-		ewarn "aRTs support is deprecated, if you have problems please consider"
+		ewarn "aRts support is deprecated, if you have problems please consider"
 		ewarn "enabling support for Xine or GStreamer"
 		ewarn "(emerge amarok again with USE=\"xine\" or USE=\"gstreamer\")."
 		ebeep 2
@@ -55,13 +55,6 @@ pkg_setup() {
 	kde_pkg_setup
 }
 
-src_unpack() {
-	kde_src_unpack
-
-	# see kde bug 101524. Applied in CVS.
-	epatch "${FILESDIR}/${P}-contextbrowser-cpu-fix.patch"
-}
-
 src_compile() {
 	# amarok does not respect kde coding standards, and makes a lot of
 	# assuptions regarding its installation directory. For this reason,
diff --git a/media-sound/amarok/amarok-1.2.ebuild b/media-sound/amarok/amarok-1.2.ebuild
deleted file mode 100644
index f2c26e6baa55..000000000000
--- a/media-sound/amarok/amarok-1.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.ebuild,v 1.2 2005/02/15 18:15:12 greg_g Exp $
-
-inherit kde eutils
-
-DESCRIPTION="amaroK - the audio player for KDE"
-HOMEPAGE="http://amarok.kde.org/"
-SRC_URI="mirror://sourceforge/amarok/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="noamazon xmms opengl xine kde arts gstreamer mysql"
-# kde: enables compilation of the konqueror sidebar plugin
-
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
-
-#	Not yet released:
-#	">=media-libs/libvisual-0.2.0
-RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
-	 arts? ( kde-base/arts
-		 || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia )
-		 || ( kde-base/akode kde-base/kdemultimedia ) )
-	 opengl? ( virtual/opengl )
-	 xmms? ( >=media-sound/xmms-1.2 )
-	 xine? ( >=media-libs/xine-lib-1_rc4 )
-	 >=media-libs/tunepimp-0.3.0
-	 >=media-libs/taglib-1.3.1
-	 gstreamer? ( >=media-libs/gst-plugins-0.8.6
-	 	      >=media-plugins/gst-plugins-mad-0.8.6 )
-	 mysql? ( >=dev-db/mysql-4 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.2
-
-pkg_setup() {
-	if use !xine && use !arts && use !gstreamer
-	then
-		die "You must enable either aRts or Xine or GStreamer"
-	fi
-}
-
-src_compile() {
-	# amarok does not respect kde coding standards, and makes a lot of
-	# assuptions regarding its installation directory. For this reason,
-	# it must be installed in the KDE install directory.
-	PREFIX="`kde-config --prefix`"
-
-	myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer) $(use_enable mysql) \
-		$(use_with opengl) $(use_enable !noamazon amazon)"
-
-	kde_src_compile
-}
diff --git a/media-sound/amarok/files/digest-amarok-1.2 b/media-sound/amarok/files/digest-amarok-1.2
deleted file mode 100644
index a9afddf26ff1..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8db7d8985152ff29e8fb7377ada74527 amarok-1.2.tar.bz2 5449066
diff --git a/media-sound/amarok/files/digest-amarok-1.2.1 b/media-sound/amarok/files/digest-amarok-1.2.1
deleted file mode 100644
index dc249de598c4..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90a8cce693a31e4d6ff552508c31aed3 amarok-1.2.1.tar.bz2 5815092
diff --git a/media-sound/amarok/files/digest-amarok-1.2.4 b/media-sound/amarok/files/digest-amarok-1.2.4
new file mode 100644
index 000000000000..d0052cf99917
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.2.4
@@ -0,0 +1 @@
+MD5 9a3bb2c043d1db169c6a370aff439e0f amarok-1.2.4.tar.bz2 6016470