xmms2: new release

3 files changed, 70 insertions, 47 deletions

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 756013ce..e6719dea 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -6,18 +6,18 @@ AUX init.d/xmms2d 480 RMD160 a933ead5c6ae87b5cd2a6a8540653c0aa6ab08ca SHA1 188a1
 MD5 055a6d0499350923e7af45d957bda06d files/init.d/xmms2d 480
 RMD160 a933ead5c6ae87b5cd2a6a8540653c0aa6ab08ca files/init.d/xmms2d 480
 SHA256 8d2885d297232e3161e65619a25511eb0b9079e874f518e78aade91cb118d691 files/init.d/xmms2d 480
-DIST xmms2-0.2DrFeelgood.tar.bz2 1012425 RMD160 2a8b4b2eca72d77119612826eeef0d6589ca13e9 SHA1 24f6a8dd84584dec2dbe695187d27b6568ba27e5 SHA256 8154dee69682ddca438e850dd0a83cda69226d147833d45b1451016dfe337162
-EBUILD xmms2-0.2.ebuild 1821 RMD160 42bfcd887b3039508e515f324222c9eb2bae4c1a SHA1 96324284502328ac722c2a139cb0184b6d2d5c6e SHA256 2da44b6403bb17298d477c93287f0a2219a138b8e7f4d061acb4bcfa80feac09
-MD5 7eff61060a461642999b96c79172d0da xmms2-0.2.ebuild 1821
-RMD160 42bfcd887b3039508e515f324222c9eb2bae4c1a xmms2-0.2.ebuild 1821
-SHA256 2da44b6403bb17298d477c93287f0a2219a138b8e7f4d061acb4bcfa80feac09 xmms2-0.2.ebuild 1821
+DIST xmms2-0.2DrGonzo.tar.bz2 1045538 RMD160 82d89fd20510cd353d004a444994f29157681257 SHA1 f6fc8e3253c0fdc69bd1365a4d72c6ca83117ce4 SHA256 59a069e2a9b00ef81870a616b0b4ae076ccf63598ec79ba2b1820df2b60f870b
+EBUILD xmms2-0.2.ebuild 2367 RMD160 21debca4dd9fb11191ae140b8c7a8cd8cf6866b9 SHA1 56f558c7cdc455a44aae40f969a6caad7535be30 SHA256 6b36d1b5a7fc13a0f7413328d6721c4e3ec19f8151774ec1cc23bae3cb8c9ca0
+MD5 1d9538b6bcaf67bb2fc5f6f04c5a4822 xmms2-0.2.ebuild 2367
+RMD160 21debca4dd9fb11191ae140b8c7a8cd8cf6866b9 xmms2-0.2.ebuild 2367
+SHA256 6b36d1b5a7fc13a0f7413328d6721c4e3ec19f8151774ec1cc23bae3cb8c9ca0 xmms2-0.2.ebuild 2367
 EBUILD xmms2-9999.ebuild 2189 RMD160 fefc586d08e2580f9340bc5928061571fb47bdb5 SHA1 3b1f0bd6902afe0b8b27c9ff054fb02d00bebc4b SHA256 428ed1d6e429d3a621f772b01ff2b8a45dd44e686a04d61d425b2e368b0f06da
 MD5 5f8ad72877decf21c76b7898ef1a7174 xmms2-9999.ebuild 2189
 RMD160 fefc586d08e2580f9340bc5928061571fb47bdb5 xmms2-9999.ebuild 2189
 SHA256 428ed1d6e429d3a621f772b01ff2b8a45dd44e686a04d61d425b2e368b0f06da xmms2-9999.ebuild 2189
-MD5 dc4ca148fff2a51c5f78e6f0570695b1 files/digest-xmms2-0.2 265
-RMD160 e297f1d669bf3cb964a9b783ed79a2d1f3f0a251 files/digest-xmms2-0.2 265
-SHA256 3ebf69752caf69339340cfa1e57e0593125820b0a9e32eb77694e245e387c5ea files/digest-xmms2-0.2 265
+MD5 e5e35653837407b972701e3ead879d66 files/digest-xmms2-0.2 256
+RMD160 695760ddd40c0c0aaab1343139a6442e12318b01 files/digest-xmms2-0.2 256
+SHA256 18bd3598bdbc3d037ea8a4e5b6b52a98f92e8ed1f58218465d928da1189e493b files/digest-xmms2-0.2 256
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-xmms2-9999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-xmms2-9999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-xmms2-9999 1
diff --git a/media-sound/xmms2/files/digest-xmms2-0.2 b/media-sound/xmms2/files/digest-xmms2-0.2
index 4586449c..e3976442 100644
--- a/media-sound/xmms2/files/digest-xmms2-0.2
+++ b/media-sound/xmms2/files/digest-xmms2-0.2
@@ -1,3 +1,3 @@
-MD5 46dc92bb78bf16d6cd9a733e6a923a92 xmms2-0.2DrFeelgood.tar.bz2 1012425
-RMD160 2a8b4b2eca72d77119612826eeef0d6589ca13e9 xmms2-0.2DrFeelgood.tar.bz2 1012425
-SHA256 8154dee69682ddca438e850dd0a83cda69226d147833d45b1451016dfe337162 xmms2-0.2DrFeelgood.tar.bz2 1012425
+MD5 0845dc7ce04d1825c28566b5c36f23b3 xmms2-0.2DrGonzo.tar.bz2 1045538
+RMD160 82d89fd20510cd353d004a444994f29157681257 xmms2-0.2DrGonzo.tar.bz2 1045538
+SHA256 59a069e2a9b00ef81870a616b0b4ae076ccf63598ec79ba2b1820df2b60f870b xmms2-0.2DrGonzo.tar.bz2 1045538
diff --git a/media-sound/xmms2/xmms2-0.2.ebuild b/media-sound/xmms2/xmms2-0.2.ebuild
index c9bc1fed..29f19328 100644
--- a/media-sound/xmms2/xmms2-0.2.ebuild
+++ b/media-sound/xmms2/xmms2-0.2.ebuild
@@ -1,70 +1,93 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 2006 Devils-Hawk
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit multilib
+inherit eutils multilib toolchain-funcs
 
-MY_P="${P}DrFeelgood"
+MY_P="${P}DrGonzo"
 
 DESCRIPTION="XMMS2 is a redesign of the XMMS music player."
 HOMEPAGE="http://wiki.xmms2.xmms.se/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1 / GPL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac alsa curl ecore flac gnome jack modplug mp3 musepack python oss ruby samba sid speex vorbis"
-RESTRICT="nomirror"
+KEYWORDS="~x86 ~amd64"
+IUSE="alsa jack oss java python ruby avahi vorbis wma mp3 aac flac gnome musepack samba modplug speex id3 daap curl sid ecore mms icecast"
+
+S=${WORKDIR}/${MY_P}
 
 RDEPEND=">=dev-libs/glib-2.6.0
 	>=dev-db/sqlite-3.2.6
-	aac? ( >=media-libs/faad2-2.0 )
+	dev-libs/boost
+	aac? ( >=media-libs/faad2-2.0)
 	alsa? ( media-libs/alsa-lib )
 	curl? ( >=net-misc/curl-7.11.2 )
-	ecore? ( x11-libs/ecore )
-	flac? ( media-libs/flac )
-	gnome? ( gnome-base/gnome-vfs )
-	jack? ( >=media-sound/jack-0.100.0 )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-sound/madplay )
-	musepack? ( media-libs/libmpcdec )
-	python? ( >=dev-lang/python-2.2.1 >=dev-python/pyrex-0.9.3 )
-	ruby? ( >=dev-lang/ruby-1.8 )
+	ecore? (x11-libs/ecore )
+	ruby? ( dev-lang/ruby )
+	java? ( virtual/jdk )
 	samba? ( net-fs/samba )
+	python? ( >=dev-lang/python-2.3 >=dev-python/pyrex-0.9.3 )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( >=media-libs/libmusepack-1.1 )
+	vorbis? ( media-libs/libvorbis
+		  media-libs/libogg )
+	flac? ( media-libs/libvorbis
+		>=media-libs/flac-1.1.2 )
+	jack? ( >=media-sound/jack-0.100.0 )
+	mp3? ( media-libs/libmad )
+	speex? ( >=media-libs/libogg-1.1
+		 media-libs/speex )
+	daap? ( >=media-libs/libopendaap-0.3.0 )	
+	avahi? ( >=net-dns/avahi-0.6 )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
 	sid? ( media-sound/sidplay media-libs/resid )
-	speex? ( media-libs/speex )
-	vorbis? ( media-libs/libvorbis )"
+	wma? ( media-video/ffmpeg )
+	mms? ( media-libs/libmms )
+	"
 DEPEND="${RDEPEND}
-	>=dev-lang/python-2.2.1
+	dev-util/pkgconfig
+	>=dev-lang/python-2.3
 	>=dev-util/scons-0.96"
 
-S=${WORKDIR}/${MY_P}
+RESTRICT="nomirror"
+
+DISABLE=""
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i \
-		-e "s:/lib:/$(get_libdir):g" \
-		SConstruct xmms2.pc.in xmmsenv.py
+	sed -i -e "s:/lib:/$(get_libdir):g" SConstruct xmms2.pc.in xmmsenv.py
 }
 
 src_compile() {
-	local u o MY_EXCLUDE=""
-	for u in aac alsa curl ecore gnome:gnomevfs modplug flac jack mp3:mad \
-	         musepack oss ruby samba sid speex vorbis ; do
+		local u o
+		for u in aac:faad alsa curl ecore gnome:gnomevfs modplug flac \
+			 jack mp3:mad musepack oss ruby samba sid speex  \
+	                 vorbis daap id3:id3v2 avahi:mdns java wma mms \
+			 python icecast:icymetaint; do
 		o=${u##*:} ; o=${o:-${u}}
 		u=${u%%:*}
-		use ${u} || MY_EXCLUDE="${MY_EXCLUDE} ${o}"
-	done
+		use ${u} || DISABLE="${DISABLE} ${o}"
+	        done
+
+		echo "Disabling: ${DISABLE}"
 
-	scons CCFLAGS="${CFLAGS}" CONFIG=1 EXCLUDE="${MY_EXCLUDE}" || die "scons failed"
+		scons \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		CCFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LINK=$(tc-getCC) \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		INSTALLDIR=${D} \
+		CONFIG="yes" \
+		EXCLUDE="${DISABLE}" || die "Scons failed!"
 }
 
 src_install() {
-	scons \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		INSTALLDIR="${D}" install \
-		|| die "scons install failed"
-	dodoc AUTHORS ChangeLog README
+		scons install || die "Scons install failed!"
+		dodoc AUTHORS ChangeLog README
 }
+