Version bump.

(Portage version: 2.0.51-r15)

7 files changed, 36 insertions, 92 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 1534229b618a..a6836bff7d7d 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2005/01/30 21:39:05 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.45 2005/02/01 15:08:05 greg_g Exp $
+
+*amarok-1.2_beta4 (01 Feb 2005)
+
+  01 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> -amarok-1.2_beta2.ebuild,
+  -amarok-1.2_beta3.ebuild, +amarok-1.2_beta4.ebuild:
+  Version bump.
 
   30 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> amarok-1.1.1.ebuild:
   added missing libsdl dependency. fixes #72395
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index c29539b37c99..9b1fb0a53ccc 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,12 +1,14 @@
-MD5 59c8365d42d2a8435fea22995ad0331c amarok-1.2_beta3.ebuild 1873
-MD5 8ab1d316a1506fe1ecff05ba7f6cf8cb amarok-1.1.1.ebuild 1578
-MD5 8dec94b33db41952f96628c1948fa301 amarok-1.0.2.ebuild 1199
+MD5 15a028c1f8fff178682119240f0189be metadata.xml 181
 MD5 48a1646be0de757e5cef8c3284740024 amarok-1.2_beta2.ebuild 1638
+MD5 8dec94b33db41952f96628c1948fa301 amarok-1.0.2.ebuild 1199
 MD5 c64ca659f2eba44af4ec01d49801e8db ChangeLog 6569
-MD5 15a028c1f8fff178682119240f0189be metadata.xml 181
+MD5 59c8365d42d2a8435fea22995ad0331c amarok-1.2_beta3.ebuild 1873
+MD5 8ab1d316a1506fe1ecff05ba7f6cf8cb amarok-1.1.1.ebuild 1578
+MD5 722a19ea166ea32f7e6949f37612fbab amarok-1.2_beta4.ebuild 1822
+MD5 33697f318e63c60a1ec8082330eece7f files/digest-amarok-1.1.1 66
+MD5 167a3a9a42477903579be25096b8eaab files/digest-amarok-1.0.2 66
 MD5 ab9e82aabb62859495632f83d21aaf1f files/digest-amarok-1.2_beta2 70
 MD5 428271172eede684069ea1e6bb53e1a5 files/digest-amarok-1.2_beta3 70
-MD5 23390f7810deeaf8ffd367ff06c8d075 files/amarok-1.0-cjk.diff 1455
+MD5 36de41fa399d57fd931b94231fbe1c85 files/digest-amarok-1.2_beta4 70
 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 23390f7810deeaf8ffd367ff06c8d075 files/amarok-1.0-cjk.diff 1455
diff --git a/media-sound/amarok/amarok-1.2_beta2.ebuild b/media-sound/amarok/amarok-1.2_beta2.ebuild
deleted file mode 100644
index 586a46479a4c..000000000000
--- a/media-sound/amarok/amarok-1.2_beta2.ebuild
+++ /dev/null
@@ -1,63 +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_beta2.ebuild,v 1.4 2005/01/14 23:53:32 danarmak Exp $
-
-IUSE="noamazon cjk xmms opengl xine arts gstreamer mysql"
-
-inherit kde eutils
-
-MY_P="${P/_beta/-beta}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="amaroK is a media player for KDE"
-HOMEPAGE="http://amarok.kde.org/"
-SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc -sparc ~x86"
-
-#	Not yet released:
-#	">=media-libs/libvisual-0.2.0
-DEPEND="|| ( kde-base/kdemultimedia-meta >=kde-base/kdemultimedia-3.2 )
-	arts? ( >=kde-base/arts-1.2 )
-	opengl? ( virtual/opengl )
-	xmms? ( >=media-sound/xmms-1.2 )
-	xine? ( >=media-libs/xine-lib-1_rc8 )
-	>=media-libs/tunepimp-0.3.0
-	>=dev-util/pkgconfig-0.9.0
-	>=media-libs/taglib-1.3
-	>=kde-base/kdelibs-3.2
-	>=x11-libs/qt-3.3
-	gstreamer? ( >=media-libs/gst-plugins-0.8.1
-	             >=media-plugins/gst-plugins-mad-0.8.1 )
-	mysql? ( >=dev-db/mysql-3 )"
-
-need-kde 3.2
-
-src_unpack() {
-	if  use !xine && use !arts
-	then
-		die "You must enable either aRts or Xine"
-	fi
-
-	kde_src_unpack
-	#CJK mp3 tag fix
-	use cjk && epatch ${FILESDIR}/amarok-1.0-cjk-a.diff
-}
-
-src_compile() {
-	PREFIX="`kde-config --prefix`"
-
-	myconf="`use_with arts` `use_with xine` `use_with gstreamer` `use_enable mysql`"
-	myconf="${myconf} `use_with opengl` `use_enable !noamazon amazon`"
-
-	kde_src_compile myconf configure make || die
-}
-
-pkg_postinst() {
-	if use gstreamer; then
-		ewarn "Gstreamer support in ${P} is known to be unstable (see bug #66902)"
-	fi
-}
diff --git a/media-sound/amarok/amarok-1.2_beta3.ebuild b/media-sound/amarok/amarok-1.2_beta4.ebuild
index a10f2e1f49e0..7bf105f65fdb 100644
--- a/media-sound/amarok/amarok-1.2_beta3.ebuild
+++ b/media-sound/amarok/amarok-1.2_beta4.ebuild
@@ -1,10 +1,10 @@
 # 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_beta3.ebuild,v 1.7 2005/01/26 13:40:16 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2_beta4.ebuild,v 1.1 2005/02/01 15:08:05 greg_g Exp $
 
 inherit kde eutils
 
-MY_P="${P/_beta/-beta}"
+MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="amaroK is a media player for KDE"
@@ -21,20 +21,20 @@ KEYWORDS="~amd64 ~ppc -sparc ~x86"
 
 #	Not yet released:
 #	">=media-libs/libvisual-0.2.0
-DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
-	arts? ( || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia )
-		|| ( kde-base/akode kde-base/kdemultimedia )
-		kde-base/arts )
-	opengl? ( virtual/opengl )
-	xmms? ( >=media-sound/xmms-1.2 )
-	xine? ( >=media-libs/xine-lib-1_rc4 )
-	>=media-libs/tunepimp-0.3.0
-	>=dev-util/pkgconfig-0.9.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-3 )"
-RDEPEND="${DEPEND}"
+RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+	 arts? ( || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia )
+		 || ( kde-base/akode kde-base/kdemultimedia )
+		 kde-base/arts )
+	 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-3 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0"
 
 need-kde 3.2
 
@@ -55,8 +55,8 @@ src_compile() {
 	# it must be installed in the KDE install directory.
 	PREFIX="`kde-config --prefix`"
 
-	myconf="${myconf} `use_with arts` `use_with xine` `use_with gstreamer` `use_enable mysql`"
-	myconf="${myconf} `use_with opengl` `use_enable !noamazon amazon`"
+	myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer) $(use_enable mysql) \
+		$(use_with opengl) $(use_enable !noamazon amazon)"
 
-	kde_src_compile myconf configure make || die
+	kde_src_compile
 }
diff --git a/media-sound/amarok/files/digest-amarok-1.2_beta2 b/media-sound/amarok/files/digest-amarok-1.2_beta2
deleted file mode 100644
index 5ec1fbbf4605..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.2_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8535db7a873f0ee2e697b98135e4b60d amarok-1.2-beta2.tar.bz2 3758100
diff --git a/media-sound/amarok/files/digest-amarok-1.2_beta3 b/media-sound/amarok/files/digest-amarok-1.2_beta3
deleted file mode 100644
index 022f4e7e64ae..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.2_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6379b144cdec4eca0556619a03f294c amarok-1.2-beta3.tar.bz2 4071317
diff --git a/media-sound/amarok/files/digest-amarok-1.2_beta4 b/media-sound/amarok/files/digest-amarok-1.2_beta4
new file mode 100644
index 000000000000..342d2f97a811
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.2_beta4
@@ -0,0 +1 @@
+MD5 13e2256a2a19953289e52db66ef992b4 amarok-1.2-beta4.tar.bz2 5483976