Add 1.4_beta1 under package.mask, with patch to fix parallel make issues.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 162 insertions, 7 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index f33824af0d54..c9704f24671b 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # 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.102 2006/02/05 17:17:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.103 2006/02/12 20:45:34 flameeyes Exp $
+
+*amarok-1.4_beta1 (12 Feb 2006)
+
+  12 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4_beta1-parallelmake.patch, +amarok-1.4_beta1.ebuild:
+  Add 1.4_beta1 under package.mask, with patch to fix parallel make issues.
 
   05 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.8.ebuild:
   Move the $LINGUAS handling to kde eclass.
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index db04f8ad4b77..f6561ddd23f6 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d2c29852dd9fed0c369938c921f647e9 ChangeLog 16235
-RMD160 b464e21262393cf0bf115cea4d3065e1d41e845b ChangeLog 16235
-SHA256 5750bcfaf0358b21ba6e5c8bd07bc83fa10b9dabe6bbfb87a090743e961f3e49 ChangeLog 16235
+MD5 59d00be7812654fdfd3a1353f42e289d ChangeLog 16470
+RMD160 cf7fbf1f567d5e11eacb64a49de0a3bf27825b3f ChangeLog 16470
+SHA256 09358bf5c8091c2d09f2b61e1ae33cfd1c54437136504f170810e3bd5fedcd1d ChangeLog 16470
 MD5 1e105a96a7b5945e07d2e2febbf464a6 amarok-1.3.6.ebuild 3206
 RMD160 5a191332318d240ec23ed6532e96542ced169856 amarok-1.3.6.ebuild 3206
 SHA256 0f0d337d50f5e51832803ef3ef5b15b1b84ef13814d0e35094392bb73b1eeb80 amarok-1.3.6.ebuild 3206
@@ -13,9 +13,15 @@ SHA256 9898b63afd7c4ec6560f3ded53bc4b02459792c4c6481d7bc58c0b8452c3cb6c amarok-1
 MD5 37dd559290e679463c0aa3c07427239c amarok-1.3.8.ebuild 3854
 RMD160 3b53d286a3e1aec0ec48f8c7dce5fe1d49d3b95b amarok-1.3.8.ebuild 3854
 SHA256 b573cb7036fcf1b8cd9d1678ff204a847f80f2db57fd23bc266d4befd9d23add amarok-1.3.8.ebuild 3854
+MD5 37938b04ed72475baec421707707066f amarok-1.4_beta1.ebuild 3852
+RMD160 1a0e7dd5d6161d405ead6a471f7c21fcf6a34c42 amarok-1.4_beta1.ebuild 3852
+SHA256 4f5c9e834b501c7c30ef68044aad1a673810f953df14e750a64493e590d0b576 amarok-1.4_beta1.ebuild 3852
 MD5 540d52ae55cc72876ea41f14032b6abf files/amarok-1.3.7-lyrc.patch 869
 RMD160 684ecb63972e77af3895a60af743ec63965f942a files/amarok-1.3.7-lyrc.patch 869
 SHA256 890014e9cf380103ace940f365723140472832ec4ac6fbd7bfea090891d52ed1 files/amarok-1.3.7-lyrc.patch 869
+MD5 112f3de18e318d1898d664063f638f18 files/amarok-1.4_beta1-parallelmake.patch 570
+RMD160 0d793e30035a13278cf60baedd3a49c1ef90237b files/amarok-1.4_beta1-parallelmake.patch 570
+SHA256 8d67d8d08c6ad39a163b3ae0a41699b5b15c4fc442c40d048947a1ff7cbbcbb2 files/amarok-1.4_beta1-parallelmake.patch 570
 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
@@ -25,13 +31,16 @@ SHA256 b59b1bf88d0088f5b98a0a7b0ba6114292de9dbebd23f37a6f6ee9e7a7153613 files/di
 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 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 metadata.xml 175
 SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 metadata.xml 175
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD5jNUAiZjviIA2XgRAljWAJ9oJ0BNOG7OAH6TvRO91NH4/cdFjACbBONw
-PJveaBQtpGKKuxHtBndmKLc=
-=ZufJ
+iD8DBQFD7556AiZjviIA2XgRAqsaAKDlMc/l1EIc9jph+dV42Gl1OJlNEgCg2VOJ
+KGbUTbAnQX38EF6I6DbjcVQ=
+=0y4Z
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4_beta1.ebuild b/media-sound/amarok/amarok-1.4_beta1.ebuild
new file mode 100644
index 000000000000..73ec9e231907
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4_beta1.ebuild
@@ -0,0 +1,124 @@
+# 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.1 2006/02/12 20:45:34 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="-*"
+IUSE="aac arts flac gstreamer kde mysql noamazon opengl postgres xine xmms
+visualization musicbrainz ipod akode"
+# 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 )"
+
+RDEPEND="${DEPEND}
+	dev-lang/ruby"
+
+DEPEND="${DEPEND}
+	>=dev-util/pkgconfig-0.9.0"
+
+PATCHES="${FILESDIR}/${P}-parallelmake.patch"
+
+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
+}
+
+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 ipod libgpod)
+				  $(use_with akode)
+				  $(use_with aac mp4v2)
+	              --without-helix
+	              --without-mas
+	              --without-nmm
+				  --without-exscalibar
+				  --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/files/amarok-1.4_beta1-parallelmake.patch b/media-sound/amarok/files/amarok-1.4_beta1-parallelmake.patch
new file mode 100644
index 000000000000..c079c3cfb620
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4_beta1-parallelmake.patch
@@ -0,0 +1,13 @@
+Index: amarok-1.4-beta1/amarok/src/Makefile.am
+===================================================================
+--- amarok-1.4-beta1.orig/amarok/src/Makefile.am
++++ amarok-1.4-beta1/amarok/src/Makefile.am
+@@ -168,7 +168,7 @@ amarokapp_SOURCES = \
+ 
+ amarokapp_LDADD = \
+     $(top_builddir)/amarok/src/amarokcore/libamarokcore.la \
+-    $(top_builddir)/amarok/src/libamarok.la \
++    libamarok.la \
+     $(top_builddir)/amarok/src/analyzers/libanalyzers.la \
+     $(top_builddir)/amarok/src/engine/libengine.la \
+     $(top_builddir)/amarok/src/plugin/libplugin.la \
diff --git a/media-sound/amarok/files/digest-amarok-1.4_beta1 b/media-sound/amarok/files/digest-amarok-1.4_beta1
new file mode 100644
index 000000000000..aacd5c6cb03a
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4_beta1
@@ -0,0 +1,3 @@
+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