move

4 files changed, 48 insertions, 33 deletions

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 6fa73f9f..d2ac7d5e 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,17 +1,15 @@
-MD5 edee3f2b15ac7895e90ef0152aff8a17 files/digest-xmms2-0.1-r2 64
 MD5 edee3f2b15ac7895e90ef0152aff8a17 files/digest-xmms2-0.1_pre1 64
-MD5 d5dbac08c4b742f7c78ed3f005c62672 files/digest-xmms2-0.1_pre1-r1 66
-MD5 3e0a2c48313c554ca4dd46a5c72112ba files/digest-xmms2-0.2 64
-MD5 7ef607abcc0cb46fa1f5c01e695d2917 files/digest-xmms2-0.2.1 66
-MD5 73285bdb56674db5eae749c14d450ad2 files/digest-xmms2-0.2.2 66
+MD5 edee3f2b15ac7895e90ef0152aff8a17 files/digest-xmms2-0.1_pre1-r1 64
+MD5 edee3f2b15ac7895e90ef0152aff8a17 files/digest-xmms2-0.1_pre1-r2 64
+MD5 3e0a2c48313c554ca4dd46a5c72112ba files/digest-xmms2-0.1_pre2 64
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xmms2-9999 0
 MD5 f8eded97f8cb107f81e29afd71707273 files/xmms2-initscript-gentoo 470
 MD5 26703ea9f5608a1aa2eee4b4f6c72e52 files/xmms2-initscript-gentoo.conf 241
-MD5 015ce7894d0636215819268f96e58dfe xmms2-0.1-r2.ebuild 2348
-MD5 65844717be8da6c92977f4e6aadcd233 xmms2-0.1_pre1-r1.ebuild 1647
-MD5 f3a79ce5660aa8d0c851ba4dadc4a5f7 xmms2-0.1_pre1.1.ebuild 2044
+MD5 f3a79ce5660aa8d0c851ba4dadc4a5f7 xmms2-0.1_pre1-r1.ebuild 2044
+MD5 015ce7894d0636215819268f96e58dfe xmms2-0.1_pre1-r2.ebuild 2348
+MD5 65844717be8da6c92977f4e6aadcd233 xmms2-0.1_pre1.1.ebuild 1647
 MD5 a805b3f483a7007f7363b579d1cdb32a xmms2-0.1_pre1.ebuild 923
-MD5 fde77dc8d76e197c2f2e4a56100c79d3 xmms2-0.2.1.ebuild 1659
-MD5 259b1a6bd371289809946b7ada1c4974 xmms2-0.2.2.ebuild 1682
-MD5 6c1cdcc9044814cbe33de3b8456396d7 xmms2-0.2.ebuild 1635
-MD5 08d28e265e850cba808868f92fffc001 xmms2-9999.ebuild 1669
+MD5 fde77dc8d76e197c2f2e4a56100c79d3 xmms2-0.1_pre2.1.ebuild 1659
+MD5 259b1a6bd371289809946b7ada1c4974 xmms2-0.1_pre2.2.ebuild 1682
+MD5 6c1cdcc9044814cbe33de3b8456396d7 xmms2-0.1_pre2.ebuild 1635
+MD5 f5a0d790fd57ffa46aa2a7e9a169f9a0 xmms2-9999.ebuild 2115
diff --git a/media-sound/xmms2/xmms2-0.1_pre2.1.ebuild b/media-sound/xmms2/xmms2-0.1_pre21.ebuild
index 9f94d090..9f94d090 100644
--- a/media-sound/xmms2/xmms2-0.1_pre2.1.ebuild
+++ b/media-sound/xmms2/xmms2-0.1_pre21.ebuild
diff --git a/media-sound/xmms2/xmms2-0.1_pre2.2.ebuild b/media-sound/xmms2/xmms2-0.1_pre22.ebuild
index 70fb4328..70fb4328 100644
--- a/media-sound/xmms2/xmms2-0.1_pre2.2.ebuild
+++ b/media-sound/xmms2/xmms2-0.1_pre22.ebuild
diff --git a/media-sound/xmms2/xmms2-9999.ebuild b/media-sound/xmms2/xmms2-9999.ebuild
index 3b94213e..f2551ecc 100644
--- a/media-sound/xmms2/xmms2-9999.ebuild
+++ b/media-sound/xmms2/xmms2-9999.ebuild
@@ -11,39 +11,48 @@ inherit eutils git
 
 MY_P="${PN}-snapshot-20${PV}"
 DESCRIPTION="X(cross)platform Music Multiplexing System. The new generation of the XMMS player."
-HOMEPAGE="http://xmms2.xmms.org"
+HOMEPAGE="http://wiki.xmms2.xmms.se/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 amd64 sparc"
-IUSE="ogg sid python ruby"
-
-RESTRICT="nomirror"
+KEYWORDS="~x86"
+IUSE="ogg sid python ruby curl alsa"
 
 DEPEND=">=dev-lang/python-2.2.1
 	>=dev-util/scons-0.94
 	>=dev-libs/glib-2.2.0
-	media-libs/libmad
-	>=dev-db/sqlite-3.2
-	>=net-misc/curl-7.11.2
+	media-sound/madplay
+	=dev-db/sqlite-3.2*
+	<=dev-db/sqlite-3.2.4
+	curl? ( >=net-misc/curl-7.11.2 )
 	ogg? ( media-libs/libvorbis )
-	sid? ||( media-sound/sidplay
+	sid? ( media-sound/sidplay
 			media-libs/resid )
 	python? ( dev-python/pyrex )
-	!python? ( !dev-python/pyrex )
-	ruby? ( >=dev-lang/ruby-1.8 )"
+	ruby? ( >=dev-lang/ruby-1.8 )
+	alsa? ( media-libs/alsa-lib )"
+RDEPEND=""
+
+MY_EXCLUDE=""
 
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
-	# The only way I found to install the ebuild with scons...
-	PYTHON_V=`python-config | tr ' ' '\n' | grep -E -- '-lpython' | cut -c 3-`
-	addpredict "/usr/lib"
-	addpredict "/usr/include/glib-2.0"
-	addpredict "/usr/include/glib-2.0/glib"
-	use python && \
-		addpredict "/usr/include/${PYTHON_V}"
-	addpredict "/usr/include"
-	scons INSTALLDIR=${D} PREFIX="/usr" ${MAKEOPTS} SYSCONFDIR="/etc" || die
+src_compile () {
+	cd ${S}
+		
+	use vorbis || MY_EXCLUDE="${MY_EXCLUDE} vorbis";
+	use curl   || MY_EXCLUDE="${MY_EXCLUDE} curl"
+	use python || MY_EXCLUDE="${MY_EXCLUDE} python"
+	use ruby   || MY_EXCLUDE="${MY_EXCLUDE} ruby"
+	use flac   || MY_EXCLUDE="${MY_EXCLUDE} flac"
+	use alsa   || MY_EXCLUDE="${MY_EXCLUDE} alsa"
+	use oss    || MY_EXCLUDE="${MY_EXCLUDE} oss"
+	use gnome  || MY_EXCLUDE="${MY_EXCLUDE} gnomevfs"
+	use samba  || MY_EXCLUDE="${MY_EXCLUDE} samba"
+
+	scons CONFIG=1 EXCLUDE="${MY_EXCLUDE}"\
+		|| die "scons CONFIG=1 EXCLUDE="${MY_EXCLUDE}" failed"
+	einfo "These modules have been excluded:"
+	einfo ${MY_EXCLUDE}
 }
 
 src_install() {
@@ -55,3 +64,11 @@ src_install() {
 	dodoc AUTHORS COPYING TODO README
 }
 
+src_install () {
+	cd ${S}
+	scons PREFIX=/usr/ MANDIR=/usr/share/man INSTALLDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog README
+	scons -c
+	
+	ewarn "This is xmms2-0.1 git release"
+}