moove

2 files changed, 22 insertions, 15 deletions

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 950563e4..3ec61acd 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,3 +1,4 @@
+MD5 26703ea9f5608a1aa2eee4b4f6c72e52 files/conf.d/xmms2-initscript-gentoo.conf 241
 MD5 edee3f2b15ac7895e90ef0152aff8a17 files/digest-xmms2-0.1_pre1 64
 MD5 edee3f2b15ac7895e90ef0152aff8a17 files/digest-xmms2-0.1_pre1-r1 64
 MD5 edee3f2b15ac7895e90ef0152aff8a17 files/digest-xmms2-0.1_pre1-r2 64
@@ -6,8 +7,7 @@ MD5 3e0a2c48313c554ca4dd46a5c72112ba files/digest-xmms2-0.1_pre2 64
 MD5 7ef607abcc0cb46fa1f5c01e695d2917 files/digest-xmms2-0.1_pre21 66
 MD5 73285bdb56674db5eae749c14d450ad2 files/digest-xmms2-0.1_pre22 66
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xmms2-9999 0
-MD5 f8eded97f8cb107f81e29afd71707273 files/xmms2-initscript-gentoo 470
-MD5 26703ea9f5608a1aa2eee4b4f6c72e52 files/xmms2-initscript-gentoo.conf 241
+MD5 f8eded97f8cb107f81e29afd71707273 files/init.d/xmms2-initscript-gentoo 470
 MD5 f3a79ce5660aa8d0c851ba4dadc4a5f7 xmms2-0.1_pre1-r1.ebuild 2044
 MD5 015ce7894d0636215819268f96e58dfe xmms2-0.1_pre1-r2.ebuild 2348
 MD5 a805b3f483a7007f7363b579d1cdb32a xmms2-0.1_pre1.ebuild 923
@@ -15,4 +15,4 @@ MD5 65844717be8da6c92977f4e6aadcd233 xmms2-0.1_pre11.ebuild 1647
 MD5 6c1cdcc9044814cbe33de3b8456396d7 xmms2-0.1_pre2.ebuild 1635
 MD5 fde77dc8d76e197c2f2e4a56100c79d3 xmms2-0.1_pre21.ebuild 1659
 MD5 259b1a6bd371289809946b7ada1c4974 xmms2-0.1_pre22.ebuild 1682
-MD5 9d4fe2aca44d098dfee6a005166a206b xmms2-9999.ebuild 2094
+MD5 e2db7ccf04a34c09929e7772a2752e6f xmms2-9999.ebuild 2205
diff --git a/media-sound/xmms2/xmms2-9999.ebuild b/media-sound/xmms2/xmms2-9999.ebuild
index 31e2e1aa..43e1fe8f 100644
--- a/media-sound/xmms2/xmms2-9999.ebuild
+++ b/media-sound/xmms2/xmms2-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://wiki.xmms2.xmms.se/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="ogg sid python ruby curl alsa"
+IUSE="ogg sid python ruby curl alsa vorbis samba flac"
 
 DEPEND=">=dev-lang/python-2.2.1
 	>=dev-util/scons-0.94
@@ -56,18 +56,25 @@ src_compile () {
 
 src_install() {
 	scons INSTALLDIR=${D} PREFIX="/usr" ${MAKEOPTS} SYSCONFDIR="/etc" install || die
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/xmms2-initscript-gentoo xmms2d
-	insinto /etc/conf.d
-	newins ${FILESDIR}/xmms2-initscript-gentoo.conf xmms2d
-	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
+
+	dodir /etc/{init.d,conf.d}
+	doinitd ${FILESDIR}/init.d/xmms2d
+	doconfd ${FILESDIR}/conf.d/xmms2d
+	
+#	exeinto /etc/init.d
+#	newexe ${FILESDIR}/xmms2-initscript-gentoo xmms2d
+#	insinto /etc/conf.d
+#	newins ${FILESDIR}/xmms2-initscript-gentoo.conf xmms2d
+
+	dodoc AUTHORS COPYING TODO README ChangeLog
 	
 	ewarn "This is xmms2-0.1 git release"
 }
+
+#src_install () {
+	#cd ${S}
+	#scons PREFIX=/usr/ MANDIR=/usr/share/man INSTALLDIR=${D} install || die
+	#scons -c
+	
+#}