Add amarok 1.4_beta2.

Package-Manager: portage-2.1_pre5-r4

7 files changed, 34 insertions, 175 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 985b66d733be..e132a4ca8bdb 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.112 2006/03/03 14:41:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.113 2006/03/05 20:24:34 flameeyes Exp $
+
+*amarok-1.4_beta2 (05 Mar 2006)
+
+  05 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4_beta1.ebuild, -amarok-1.4_beta1-r1.ebuild,
+  +amarok-1.4_beta2.ebuild:
+  Add amarok 1.4_beta2.
 
 *amarok-1.4_beta1-r1 (03 Mar 2006)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index c789b6468de6..317fce60cd58 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,40 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9ce97d506b55327d1862da63105f65f6 ChangeLog 17830
-RMD160 33e297d9664d407ac845a0bf3ad640dae8722f91 ChangeLog 17830
-SHA256 32d1e9d994533b593626b450cc9e8f793643fae724b052fbdbba72ae4bc6ba5e ChangeLog 17830
+MD5 0fd885e4b7c5c431fae43e1b6035d43e ChangeLog 18026
+RMD160 bb6fdfd6dacea3be5963ca71c2926ccdcac32fcf ChangeLog 18026
+SHA256 b5a41629e52d56e464baf0278f67edb920025af01c2cd4e95f3bdc690e3b44c4 ChangeLog 18026
 MD5 1e105a96a7b5945e07d2e2febbf464a6 amarok-1.3.6.ebuild 3206
 RMD160 5a191332318d240ec23ed6532e96542ced169856 amarok-1.3.6.ebuild 3206
 SHA256 0f0d337d50f5e51832803ef3ef5b15b1b84ef13814d0e35094392bb73b1eeb80 amarok-1.3.6.ebuild 3206
 MD5 a3f0175170ae7d5ced31ae12818ceb56 amarok-1.3.8.ebuild 3849
 RMD160 8c26a9686a466c3e711db42ad060c58f47695bf7 amarok-1.3.8.ebuild 3849
 SHA256 e861d7aad63db24af75ab42ffa6a963664403ce99c638827934ff687bfec4e3d amarok-1.3.8.ebuild 3849
-MD5 9d2e38cacc74839ac225354a4160b959 amarok-1.4_beta1-r1.ebuild 3924
-RMD160 cc4ee6cfe60a6f46139b249eff8691b42a0bb7ed amarok-1.4_beta1-r1.ebuild 3924
-SHA256 25b835692873c7c76936d555b9662eb0a977c447935a8be201fceadabebc18a3 amarok-1.4_beta1-r1.ebuild 3924
-MD5 ec8784b68dbb3d0cf59ca04a04421a5e amarok-1.4_beta1.ebuild 3950
-RMD160 718fc6857de892c3bea46fc25ce6961331d13129 amarok-1.4_beta1.ebuild 3950
-SHA256 af2c0646b5a38660dbfefdb575682c6d030ec6e0e6d725b97d4b4356cd4da4fe amarok-1.4_beta1.ebuild 3950
+MD5 62c76b12fe2c5b3c7947200728843142 amarok-1.4_beta2.ebuild 3511
+RMD160 f82b913306b8101570d7a8d2e6c8bd56536ece0f amarok-1.4_beta2.ebuild 3511
+SHA256 b672c0280afda723131ac0b47f14a09a8daad3f0aae50bd812f0bc7b772a221c amarok-1.4_beta2.ebuild 3511
 MD5 d8cfb3a78866379e2ac9b439de887551 files/digest-amarok-1.3.6 66
 RMD160 79e1a1bc29d9522e664a3f0988ef0424a89cd5fb files/digest-amarok-1.3.6 66
 SHA256 1724cb7613dce986faa95f8afd7bd13aab23c086a3a5c37b6352a706501239f0 files/digest-amarok-1.3.6 66
 MD5 4cdce240143e17652ea80b4b7c58ddaa files/digest-amarok-1.3.8 66
 RMD160 59131edb3541ab3085e58faa98980e75ceda5e25 files/digest-amarok-1.3.8 66
 SHA256 9077a159e1b9d0b8da962a219de739c0ae90f5de27dad4c50b84a91b59ec6de0 files/digest-amarok-1.3.8 66
-MD5 ca79120f48ea50a68f8d5b09a2c4c253 files/digest-amarok-1.4_beta1 259
-RMD160 9059a92a67cf80bbcea4005661a904080a4f08cb files/digest-amarok-1.4_beta1 259
-SHA256 cc63242b43636bbfef283b54f8f96d5ea6598722c6c75b867b05b40f434badfb files/digest-amarok-1.4_beta1 259
-MD5 ca79120f48ea50a68f8d5b09a2c4c253 files/digest-amarok-1.4_beta1-r1 259
-RMD160 9059a92a67cf80bbcea4005661a904080a4f08cb files/digest-amarok-1.4_beta1-r1 259
-SHA256 cc63242b43636bbfef283b54f8f96d5ea6598722c6c75b867b05b40f434badfb files/digest-amarok-1.4_beta1-r1 259
+MD5 a2cbf713a42feda7eb45a7e0a11959cd files/digest-amarok-1.4_beta2 259
+RMD160 14b33493147f2211c2713352589c0cdbe0b165ad files/digest-amarok-1.4_beta2 259
+SHA256 ad5f2c72401dfc4ee83d8e67c7df8d7fa459aac50350f2f2dc234d23cc41ca5c files/digest-amarok-1.4_beta2 259
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 metadata.xml 175
 SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 metadata.xml 175
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFECFXLAiZjviIA2XgRAkpxAJ44O9Iqt45nw0wHaSfCdj2cMbAYyACfQicI
-OWI2NVD1hIfjzFiO7Eaq0A8=
-=HUFL
+iD8DBQFEC0jgAiZjviIA2XgRAkkuAJ9BSFfjEjwpCT/q2yoNEUuCKlPuBACcDyYm
+ehJeo7tB7yQTSBlpWgDQ148=
+=2d78
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4_beta1.ebuild b/media-sound/amarok/amarok-1.4_beta1.ebuild
deleted file mode 100644
index 2204759b3c94..000000000000
--- a/media-sound/amarok/amarok-1.4_beta1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4_beta1.ebuild,v 1.5 2006/02/19 22:03:41 flameeyes Exp $
-
-LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ko lt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz xx zh_CN zh_TW"
-LANGS_DOC="da de es et fr it nl pt pt_BR ru sv"
-
-USE_KEG_PACKAGING=1
-
-inherit kde eutils flag-o-matic
-
-MY_P="${P/_rc/_RC}"
-MY_P="${MY_P/_beta/-beta}"
-S="${WORKDIR}/${MY_P/_RC*//}"
-
-DESCRIPTION="amaroK - the audio 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 ~ppc64 ~sparc ~x86"
-IUSE="aac arts exscalibar flac gstreamer kde mysql noamazon opengl postgres xine xmms
-visualization musicbrainz ipod akode real"
-# kde: enables compilation of the konqueror sidebar plugin
-
-DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase )
-		|| ( kde-base/kdemultimedia-kioslaves kde-base/kdemultimedia ) )
-	arts? ( kde-base/arts
-	        || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
-	xine? ( >=media-libs/xine-lib-1_rc4 )
-	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
-	musicbrainz? ( >=media-libs/tunepimp-0.3 )
-	>=media-libs/taglib-1.4
-	mysql? ( >=dev-db/mysql-4.0.16 )
-	postgres? ( dev-db/postgresql )
-	opengl? ( virtual/opengl )
-	xmms? ( >=media-sound/xmms-1.2 )
-	visualization? ( media-libs/libsdl
-	                 >=media-plugins/libvisual-plugins-0.2 )
-	ipod? ( media-libs/libgpod )
-	akode? ( media-libs/akode )
-	aac? ( media-libs/libmp4v2 )
-	exscalibar? ( media-libs/exscalibar )
-	real? ( media-video/realplayer )"
-
-RDEPEND="${DEPEND}
-	dev-lang/ruby"
-
-DEPEND="${DEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.3
-
-pkg_setup() {
-	if use arts && ! use xine && ! use gstreamer; then
-		ewarn "aRts support is deprecated, if you have problems please consider"
-		ewarn "enabling support for Xine (preferred) or GStreamer"
-		ewarn "(emerge amarok again with USE=\"xine\" or USE=\"gstreamer\")."
-		ebeep 2
-	fi
-
-	if ! use arts && ! use xine && ! use gstreamer; then
-		eerror "amaroK needs either aRts (deprecated), Xine (preferred) or GStreamer to work,"
-		eerror "please try again with USE=\"arts\", USE=\"xine\" or USE=\"gstreamer\"."
-		die
-	fi
-
-	# check whether kdelibs was compiled with arts support
-	kde_pkg_setup
-
-	append-flags -fno-inline
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	# fix parallel make issues
-	sed -i -e 's:$(top_builddir)/amarok/src/libamarok.la:libamarok.la:' \
-		${S}/amarok/src/Makefile.am
-
-	rm -f ${S}/configure
-}
-
-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="${KDEDIR}"
-
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer)
-	              $(use_enable mysql) $(use_enable postgres postgresql)
-	              $(use_with opengl) $(use_with xmms)
-	              $(use_with visualization libvisual)
-	              $(use_enable !noamazon amazon)
-	              $(use_with musicbrainz)
-	              $(use_with exscalibar)
-				  $(use_with ipod libgpod)
-				  $(use_with akode)
-				  $(use_with aac mp4v2)
-				  $(use_with real helix)
-	              --without-mas
-	              --without-nmm
-				  --without-ifp
-				  --without-gstreamer10"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# Workaround to use amaroK from outside KDE
-
-	# move the desktop file in /usr/share
-	dodir /usr/share/applications/kde
-	mv ${D}${KDEDIR}/share/applications/kde/amarok.desktop \
-		${D}/usr/share/applications/kde/amarok.desktop || die
-	# move icons, too
-	dodir /usr/share/icons
-	mv ${D}${KDEDIR}/share/icons/hicolor \
-		${D}/usr/share/icons || die
-}
-
diff --git a/media-sound/amarok/amarok-1.4_beta1-r1.ebuild b/media-sound/amarok/amarok-1.4_beta2.ebuild
index d604b17a8ffc..dbddc3cb4c37 100644
--- a/media-sound/amarok/amarok-1.4_beta1-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4_beta2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4_beta1-r1.ebuild,v 1.1 2006/03/03 14:41:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4_beta2.ebuild,v 1.1 2006/03/05 20:24:35 flameeyes Exp $
 
-LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ko lt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz xx zh_CN zh_TW"
+LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ko
+lt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz xx zh_CN
+zh_TW"
 LANGS_DOC="da de es et fr it nl pt pt_BR ru sv"
 
 USE_KEG_PACKAGING=1
@@ -29,7 +31,8 @@ DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase )
 	arts? ( kde-base/arts
 	        || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) )
 	xine? ( >=media-libs/xine-lib-1_rc4 )
-	gstreamer? ( =media-libs/gstreamer-0.10* )
+	gstreamer? ( =media-libs/gstreamer-0.10*
+		=media-libs/gst-plugins-base-0.10* )
 	musicbrainz? ( >=media-libs/tunepimp-0.3 )
 	>=media-libs/taglib-1.4
 	mysql? ( >=dev-db/mysql-4.0.16 )
@@ -53,16 +56,10 @@ DEPEND="${DEPEND}
 need-kde 3.3
 
 pkg_setup() {
-	if use arts && ! use xine && ! use gstreamer; then
-		ewarn "aRts support is deprecated, if you have problems please consider"
-		ewarn "enabling support for Xine (preferred) or GStreamer"
-		ewarn "(emerge amarok again with USE=\"xine\" or USE=\"gstreamer\")."
-		ebeep 2
-	fi
-
-	if ! use arts && ! use xine && ! use gstreamer; then
+	if ! use xine && ! use gstreamer && ! use akode && ! use real; then
 		eerror "amaroK needs either aRts (deprecated), Xine (preferred) or GStreamer to work,"
-		eerror "please try again with USE=\"arts\", USE=\"xine\" or USE=\"gstreamer\"."
+		eerror "please try again enabling at least one of akode, xine, gstreamer or real"
+		eerror "useflags."
 		die
 	fi
 
@@ -72,16 +69,6 @@ pkg_setup() {
 	append-flags -fno-inline
 }
 
-src_unpack() {
-	kde_src_unpack
-
-	# fix parallel make issues
-	sed -i -e 's:$(top_builddir)/amarok/src/libamarok.la:libamarok.la:' \
-		${S}/amarok/src/Makefile.am
-
-	rm -f ${S}/configure
-}
-
 src_compile() {
 	# amarok does not respect kde coding standards, and makes a lot of
 	# assuptions regarding its installation directory. For this reason,
@@ -89,8 +76,8 @@ src_compile() {
 	PREFIX="${KDEDIR}"
 
 	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer)
-				  $(use_with gstreamer gstreamer 10)
+	local myconf="$(use_with arts) $(use_with xine)
+				  $(use_with gstreamer gstreamer10)
 	              $(use_enable mysql) $(use_enable postgres postgresql)
 	              $(use_with opengl) $(use_with xmms)
 	              $(use_with visualization libvisual)
diff --git a/media-sound/amarok/files/digest-amarok-1.4_beta1 b/media-sound/amarok/files/digest-amarok-1.4_beta1
deleted file mode 100644
index aacd5c6cb03a..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78dfa2c8c65cb7fe1cf26aaa6cc193e8 amarok-1.4-beta1.tar.bz2 10399877
-RMD160 2ac585caa57801e48f995d4dc7a916995af7b775 amarok-1.4-beta1.tar.bz2 10399877
-SHA256 c3f7545943ca8031dff4ef8d653606283a54a7b15aa314e694ca8800f97c1a33 amarok-1.4-beta1.tar.bz2 10399877
diff --git a/media-sound/amarok/files/digest-amarok-1.4_beta1-r1 b/media-sound/amarok/files/digest-amarok-1.4_beta1-r1
deleted file mode 100644
index aacd5c6cb03a..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.4_beta1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78dfa2c8c65cb7fe1cf26aaa6cc193e8 amarok-1.4-beta1.tar.bz2 10399877
-RMD160 2ac585caa57801e48f995d4dc7a916995af7b775 amarok-1.4-beta1.tar.bz2 10399877
-SHA256 c3f7545943ca8031dff4ef8d653606283a54a7b15aa314e694ca8800f97c1a33 amarok-1.4-beta1.tar.bz2 10399877
diff --git a/media-sound/amarok/files/digest-amarok-1.4_beta2 b/media-sound/amarok/files/digest-amarok-1.4_beta2
new file mode 100644
index 000000000000..31563e0256b9
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4_beta2
@@ -0,0 +1,3 @@
+MD5 0c7e2a5e8ea2d73d8e73b986090cfc37 amarok-1.4-beta2.tar.bz2 10102269
+RMD160 a8652dc464f6f38a39120406ac2157f2b24e2168 amarok-1.4-beta2.tar.bz2 10102269
+SHA256 a93f3c7940e07caaa71738300562427c12739e11da27be76b55e93e36febca42 amarok-1.4-beta2.tar.bz2 10102269