xmms2: new release, delete old

18 files changed, 19 insertions, 571 deletions

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index c98a9a7d..82ff10ed 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,60 +1,18 @@
 MD5 26703ea9f5608a1aa2eee4b4f6c72e52 files/conf.d/xmms2d 241
 RMD160 d4af4e5138044b4f4527b620007f881c5a04da8a files/conf.d/xmms2d 241
 SHA256 3da32cafe04081f261daf6b54b215e69ac681303fd5d830acc14800f2808dec8 files/conf.d/xmms2d 241
-MD5 2860e3e804320068c0ed65763bc21773 files/digest-xmms2-0.1_pre1 238
-RMD160 c4b7a37149fd108c3bda2980dc275ae6d9c395e6 files/digest-xmms2-0.1_pre1 238
-SHA256 b818148e9262a5c2e6a632f674696e1e31452760b88de4e3676a38736fc29bf2 files/digest-xmms2-0.1_pre1 238
-MD5 2860e3e804320068c0ed65763bc21773 files/digest-xmms2-0.1_pre1-r1 238
-RMD160 c4b7a37149fd108c3bda2980dc275ae6d9c395e6 files/digest-xmms2-0.1_pre1-r1 238
-SHA256 b818148e9262a5c2e6a632f674696e1e31452760b88de4e3676a38736fc29bf2 files/digest-xmms2-0.1_pre1-r1 238
-MD5 2860e3e804320068c0ed65763bc21773 files/digest-xmms2-0.1_pre1-r2 238
-RMD160 c4b7a37149fd108c3bda2980dc275ae6d9c395e6 files/digest-xmms2-0.1_pre1-r2 238
-SHA256 b818148e9262a5c2e6a632f674696e1e31452760b88de4e3676a38736fc29bf2 files/digest-xmms2-0.1_pre1-r2 238
-MD5 db56ce73ee219025e169181e0e7bf965 files/digest-xmms2-0.1_pre2 238
-RMD160 0b36b95df2c3eac9ba7fcbf058ed5c2d4d8b3e40 files/digest-xmms2-0.1_pre2 238
-SHA256 51487cd7957f35347322748b1e02dcee42015ac0937185790b031d3fa86fe072 files/digest-xmms2-0.1_pre2 238
-MD5 a976205d65196e2867e305a5cd27b6ea files/digest-xmms2-0.2 256
-RMD160 dec059d1191aa480e027b41920141f63ef84c503 files/digest-xmms2-0.2 256
-SHA256 62c3c509acc9481124ad13f993df5653d91a1c67bf5d73c05dcbbdcfc7801935 files/digest-xmms2-0.2 256
-MD5 4b7d5a8216c8fd8a5c6b3b26cb8814aa files/digest-xmms2-0.2_pre0 253
-RMD160 07d4da3203f3ba348588565f1cec9001be10cd11 files/digest-xmms2-0.2_pre0 253
-SHA256 e107af89be80649b8912bc9cf7c2a732c2307ae30792e36fc4db957c669d4c39 files/digest-xmms2-0.2_pre0 253
-MD5 a976205d65196e2867e305a5cd27b6ea files/digest-xmms2-0.2_pre1 256
-RMD160 dec059d1191aa480e027b41920141f63ef84c503 files/digest-xmms2-0.2_pre1 256
-SHA256 62c3c509acc9481124ad13f993df5653d91a1c67bf5d73c05dcbbdcfc7801935 files/digest-xmms2-0.2_pre1 256
-MD5 a976205d65196e2867e305a5cd27b6ea files/digest-xmms2-0.2_pre3 256
-RMD160 dec059d1191aa480e027b41920141f63ef84c503 files/digest-xmms2-0.2_pre3 256
-SHA256 62c3c509acc9481124ad13f993df5653d91a1c67bf5d73c05dcbbdcfc7801935 files/digest-xmms2-0.2_pre3 256
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xmms2-9999 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xmms2-9999 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xmms2-9999 0
+MD5 bffb64224d80ad17ff4e55ef4ebb4294 files/digest-xmms2-0.2 262
+RMD160 97266c9a467b34298d7e2e84e02c4fb76c357c3f files/digest-xmms2-0.2 262
+SHA256 eced8174caa7b20adf41bfb669206bb75e834fe25d01d1f38a4459ffaa970b22 files/digest-xmms2-0.2 262
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-xmms2-9999 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-xmms2-9999 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-xmms2-9999 1
 MD5 055a6d0499350923e7af45d957bda06d files/init.d/xmms2d 480
 RMD160 a933ead5c6ae87b5cd2a6a8540653c0aa6ab08ca files/init.d/xmms2d 480
 SHA256 8d2885d297232e3161e65619a25511eb0b9079e874f518e78aade91cb118d691 files/init.d/xmms2d 480
-MD5 f3a79ce5660aa8d0c851ba4dadc4a5f7 xmms2-0.1_pre1-r1.ebuild 2044
-RMD160 3a4f4fcfc55204b6dd43b711601c35af4e57e9d0 xmms2-0.1_pre1-r1.ebuild 2044
-SHA256 4c53746f4fcc142a81eff37c441c206d2f5bd85ab9ac818da4ce15d76b8f5f2f xmms2-0.1_pre1-r1.ebuild 2044
-MD5 015ce7894d0636215819268f96e58dfe xmms2-0.1_pre1-r2.ebuild 2348
-RMD160 07f0783b802544dfa5ba7ce6d844b56703ade25c xmms2-0.1_pre1-r2.ebuild 2348
-SHA256 6e3d9c8d83140e2394507d3570849fbaaf6cbad8c44444467d9d8197b8f330de xmms2-0.1_pre1-r2.ebuild 2348
-MD5 a805b3f483a7007f7363b579d1cdb32a xmms2-0.1_pre1.ebuild 923
-RMD160 7ad8532d80e4f0fb83393b3ebcfd3b00f3870e5f xmms2-0.1_pre1.ebuild 923
-SHA256 161450888cd8c671122c9685b970dc40fe12523a36038586d9a9f082a057c97b xmms2-0.1_pre1.ebuild 923
-MD5 23b4d67aca26ef4de31fbd411d62837e xmms2-0.1_pre2.ebuild 1642
-RMD160 8ec9485b33d12a5c0aa32da77cf08a02bc3d8ce4 xmms2-0.1_pre2.ebuild 1642
-SHA256 94f450feed5739dc59ac2c827ddf2f4dfa3679feb807cc5033c810de39ac48c0 xmms2-0.1_pre2.ebuild 1642
-MD5 c6a41db941829782d3e7cc7c17854edf xmms2-0.2.ebuild 1760
-RMD160 32233151602b3f6b265d4b09c69b66f912318982 xmms2-0.2.ebuild 1760
-SHA256 1322574f1707800bbd2bde04b6368c4ebdbdcf41350bbaf07f942d20e954921d xmms2-0.2.ebuild 1760
-MD5 7e31b85f52fb5db4bd97fdb165754add xmms2-0.2_pre0.ebuild 2315
-RMD160 068cb7f7e75bb401237732de5fb82d09cadd2d75 xmms2-0.2_pre0.ebuild 2315
-SHA256 cc0d50ab3babe9eb944af1457599bc20423a03e39904bb87ede6e4ffd34dcdac xmms2-0.2_pre0.ebuild 2315
-MD5 86b37e826a3bea15392ddd6c215f113e xmms2-0.2_pre1.ebuild 2232
-RMD160 02fa7d860607ebfcd56e4e609ceba7aa5fefb5a0 xmms2-0.2_pre1.ebuild 2232
-SHA256 d982a5a200c855fc97bde15c607ed7958bc1d1324bce8e770322cc301f329c5e xmms2-0.2_pre1.ebuild 2232
-MD5 487b33f57d6bdd39035030c5f6b45b5b xmms2-0.2_pre3.ebuild 2364
-RMD160 3375a167d36f58813dbcc91f3c46db979c3bfcfb xmms2-0.2_pre3.ebuild 2364
-SHA256 dad8028aa462b2c4d204ef940784c74a5256206ea9d8dd00bcc4fe8f76513793 xmms2-0.2_pre3.ebuild 2364
+MD5 7791e209c7a970da4cadf461eca4e786 xmms2-0.2.ebuild 1821
+RMD160 9f572604b539f1e5a54e3e29ff65975b399a03d3 xmms2-0.2.ebuild 1821
+SHA256 9077c718bb339d90fdf7bbb77a053b52dd2e2f237a8030fa86a793fa031ce446 xmms2-0.2.ebuild 1821
 MD5 5f8ad72877decf21c76b7898ef1a7174 xmms2-9999.ebuild 2189
 RMD160 fefc586d08e2580f9340bc5928061571fb47bdb5 xmms2-9999.ebuild 2189
 SHA256 428ed1d6e429d3a621f772b01ff2b8a45dd44e686a04d61d425b2e368b0f06da xmms2-9999.ebuild 2189
diff --git a/media-sound/xmms2/files/digest-xmms2-0.1_pre1 b/media-sound/xmms2/files/digest-xmms2-0.1_pre1
deleted file mode 100644
index bcc22d28..00000000
--- a/media-sound/xmms2/files/digest-xmms2-0.1_pre1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b169758bf76eeefade79d3434ed407de xmms2-0.1DR1.tar.gz 640442
-RMD160 3feb77c5065504d59096080bfd2898300044bf94 xmms2-0.1DR1.tar.gz 640442
-SHA256 d15ccb2d7355aa9f4a4c3520e3637ff10931726388dd9c45b492fcdc8cfcf029 xmms2-0.1DR1.tar.gz 640442
diff --git a/media-sound/xmms2/files/digest-xmms2-0.1_pre1-r1 b/media-sound/xmms2/files/digest-xmms2-0.1_pre1-r1
deleted file mode 100644
index bcc22d28..00000000
--- a/media-sound/xmms2/files/digest-xmms2-0.1_pre1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b169758bf76eeefade79d3434ed407de xmms2-0.1DR1.tar.gz 640442
-RMD160 3feb77c5065504d59096080bfd2898300044bf94 xmms2-0.1DR1.tar.gz 640442
-SHA256 d15ccb2d7355aa9f4a4c3520e3637ff10931726388dd9c45b492fcdc8cfcf029 xmms2-0.1DR1.tar.gz 640442
diff --git a/media-sound/xmms2/files/digest-xmms2-0.1_pre1-r2 b/media-sound/xmms2/files/digest-xmms2-0.1_pre1-r2
deleted file mode 100644
index bcc22d28..00000000
--- a/media-sound/xmms2/files/digest-xmms2-0.1_pre1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b169758bf76eeefade79d3434ed407de xmms2-0.1DR1.tar.gz 640442
-RMD160 3feb77c5065504d59096080bfd2898300044bf94 xmms2-0.1DR1.tar.gz 640442
-SHA256 d15ccb2d7355aa9f4a4c3520e3637ff10931726388dd9c45b492fcdc8cfcf029 xmms2-0.1DR1.tar.gz 640442
diff --git a/media-sound/xmms2/files/digest-xmms2-0.1_pre2 b/media-sound/xmms2/files/digest-xmms2-0.1_pre2
deleted file mode 100644
index 8efa103f..00000000
--- a/media-sound/xmms2/files/digest-xmms2-0.1_pre2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fe1135688edacc4094566f73e02a9ff1 xmms2-0.1DR2.tar.gz 671310
-RMD160 7eb6c99e486a236a29823f598318b25890b3f9b5 xmms2-0.1DR2.tar.gz 671310
-SHA256 5e20e91c350844b5aa6556c323b24d735098a41d739181b9c08dc7eeb9a7703f xmms2-0.1DR2.tar.gz 671310
diff --git a/media-sound/xmms2/files/digest-xmms2-0.2 b/media-sound/xmms2/files/digest-xmms2-0.2
index 7c19d9b5..031fa985 100644
--- a/media-sound/xmms2/files/digest-xmms2-0.2
+++ b/media-sound/xmms2/files/digest-xmms2-0.2
@@ -1,3 +1,3 @@
-MD5 2477865f4e609f58e00d4ab27d8c4fbf xmms2-0.2DrBombay.tar.bz2 950188
-RMD160 85d27557c783791c49683a2c934cee25d7a9d1ec xmms2-0.2DrBombay.tar.bz2 950188
-SHA256 c4845c2cd4cd629b586a674bddd303f6f8fb1fac73490af0bb9f76b1a0e354a2 xmms2-0.2DrBombay.tar.bz2 950188
+MD5 93daf53d21d198d8e05bf4de37976d7a xmms2-0.2DrDolittle.tar.bz2 965031
+RMD160 4689610c0797cd4d1a914ac893a0480fc0269faa xmms2-0.2DrDolittle.tar.bz2 965031
+SHA256 896b3a63a2c0141c278a8ab0203f11ce8594e64e3bea9129db52388c00672535 xmms2-0.2DrDolittle.tar.bz2 965031
diff --git a/media-sound/xmms2/files/digest-xmms2-0.2_pre0 b/media-sound/xmms2/files/digest-xmms2-0.2_pre0
deleted file mode 100644
index 35ba170a..00000000
--- a/media-sound/xmms2/files/digest-xmms2-0.2_pre0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 172368d5d03d3f309641f82aef7490f5 xmms2-0.2DrAlban.tar.bz2 687706
-RMD160 83772b58a06bcc4d7c7c88065ead15b9802ace5b xmms2-0.2DrAlban.tar.bz2 687706
-SHA256 91067bd9c4d378e2afcd8506c40c9a3af168cd916241fbf7039fb5efb1788ad4 xmms2-0.2DrAlban.tar.bz2 687706
diff --git a/media-sound/xmms2/files/digest-xmms2-0.2_pre1 b/media-sound/xmms2/files/digest-xmms2-0.2_pre1
deleted file mode 100644
index 7c19d9b5..00000000
--- a/media-sound/xmms2/files/digest-xmms2-0.2_pre1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2477865f4e609f58e00d4ab27d8c4fbf xmms2-0.2DrBombay.tar.bz2 950188
-RMD160 85d27557c783791c49683a2c934cee25d7a9d1ec xmms2-0.2DrBombay.tar.bz2 950188
-SHA256 c4845c2cd4cd629b586a674bddd303f6f8fb1fac73490af0bb9f76b1a0e354a2 xmms2-0.2DrBombay.tar.bz2 950188
diff --git a/media-sound/xmms2/files/digest-xmms2-0.2_pre3 b/media-sound/xmms2/files/digest-xmms2-0.2_pre3
deleted file mode 100644
index 7c19d9b5..00000000
--- a/media-sound/xmms2/files/digest-xmms2-0.2_pre3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2477865f4e609f58e00d4ab27d8c4fbf xmms2-0.2DrBombay.tar.bz2 950188
-RMD160 85d27557c783791c49683a2c934cee25d7a9d1ec xmms2-0.2DrBombay.tar.bz2 950188
-SHA256 c4845c2cd4cd629b586a674bddd303f6f8fb1fac73490af0bb9f76b1a0e354a2 xmms2-0.2DrBombay.tar.bz2 950188
diff --git a/media-sound/xmms2/files/digest-xmms2-9999 b/media-sound/xmms2/files/digest-xmms2-9999
index e69de29b..8b137891 100644
--- a/media-sound/xmms2/files/digest-xmms2-9999
+++ b/media-sound/xmms2/files/digest-xmms2-9999
@@ -0,0 +1 @@
+
diff --git a/media-sound/xmms2/xmms2-0.1_pre1-r1.ebuild b/media-sound/xmms2/xmms2-0.1_pre1-r1.ebuild
deleted file mode 100644
index bfca91f8..00000000
--- a/media-sound/xmms2/xmms2-0.1_pre1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# Nonofficial ebuild by Ycarus. For new version look here : http://gentoo.zugaina.org/
-
-inherit eutils
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. The new generation of the XMMS player."
-DESCRIPTION_FR="X(cross)platform Music Multiplexing System. La nouvelle generation de XMMS."
-HOMEPAGE="http://xmms2.xmms.org"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-0.1DR1.tar.gz"
-
-LICENSE="LGPL"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE="ogg sid python ruby"
-
-RESTRICT="nomirror"
-
-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
-	ogg? ( media-libs/libvorbis )
-	sid? ( media-sound/sidplay
-		|| media-libs/resid )
-	python? ( dev-python/pyrex )
-	!python? ( !dev-python/pyrex )
-	ruby? ( >=dev-lang/ruby-1.8 )"
-
-S=${WORKDIR}/xmms2-0.1DR1
-
-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"
-	addpredict  "/usr/include/${PYTHON_V}"
-	addpredict "/usr/include"
-	scons
-	scons PREFIX="/usr" ${MAKEOPTS} SYSCONFDIR="/etc" || die
-}
-
-src_install() {
-	PYTHON_V=`python-config | tr ' ' '\n' | grep -E -- '-lpython' | cut -c 3-`
-	dodir /usr/bin /usr/lib/xmms2 /usr/lib/${PYTHON_V}/site-packages /usr/include/xmms /usr/include/internal
-	exeinto /usr/bin
-	doexe builddir/clients/sdl-vis/sdl-vis
-	doexe builddir/clients/cli/xmms2
-	doexe builddir/xmms/xmms2d
-	insinto /usr/lib
-	doins builddir/clients/lib/xmmsclient/libxmmsclient.so
-
-	insinto /usr/lib/${PYTHON_V}/site-packages
-	doins src/clients/lib/python/xmmsclient.so
-	insinto /usr/lib/xmms2
-	doins builddir/plugins/libxmms*.so
-	insinto /usr/include/xmms
-	doins src/include/xmms/*.h
-	insinto /usr/include/internal
-	doins src/include/internal/*.h
-	dodoc AUTHORS COPYING TODO README
-}
-
diff --git a/media-sound/xmms2/xmms2-0.1_pre1-r2.ebuild b/media-sound/xmms2/xmms2-0.1_pre1-r2.ebuild
deleted file mode 100644
index 29353aef..00000000
--- a/media-sound/xmms2/xmms2-0.1_pre1-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# By Beber, Thanks to Ycarus & Olivier
-
-inherit eutils
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. The new generation of the XMMS player."
-DESCRIPTION_FR="X(cross)platform Music Multiplexing System. La nouvelle generation de XMMS."
-HOMEPAGE="http://xmms2.xmms.org"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-0.1DR1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc"
-IUSE="ogg sid python ruby"
-
-RESTRICT="nomirror"
-
-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
-	ogg? ( media-libs/libvorbis )
-	sid? ||( media-sound/sidplay
-			media-libs/resid )
-	python? ( dev-python/pyrex )
-	!python? ( !dev-python/pyrex )
-	ruby? ( >=dev-lang/ruby-1.8 )"
-
-S=${WORKDIR}/xmms2-0.1DR1
-
-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
-	scons PREFIX="/usr" ${MAKEOPTS} SYSCONFDIR="/etc" || die
-}
-
-src_install() {
-	
-	dodir /usr/bin /usr/lib/xmms2 /usr/include/xmms2 /usr/include/internal
-	
-	if `use python` ; then
-		PYTHON_VER=`python-config | tr ' ' '\n' | grep -E -- '-lpython' | cut -c 3-`
-		dodir /usr/lib/${PYTHON_VER}/site-packages
-
-		insinto /usr/lib/${PYTHON_VER}/site-packages
-		doins src/clients/lib/python/xmmsclient.so
-	fi
-
-	if `use ruby`; then
-		RUBY_VER=`ruby --version | cut -c 6-8`
-		RUBY_ARCH=`ruby --version | cut -d '[' -f 2 | cut -f ']' -f 1`
-		insinto /usr/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}
-		doins src/clients/lib/ruby/xmmsclient*.so
-	fi
-	
-	exeinto /usr/bin
-	doexe src/clients/cli/xmms2
-	doexe src/xmms/xmms2d
-	
-	insinto /usr/lib
-	doins src/clients/lib/xmmsclient/*.so
-	doins src/clients/lib/xmmsclient-carbon/*.so
-	doins src/clients/lib/xmmsclient-cocoa/*.so
-	doins src/clients/lib/xmmsclient-ecore/*.so
-	doins src/clients/lib/xmmsclient-glib/*.so
-
-	insinto /usr/lib/xmms2
-	doins src/plugins/*/libxmms*.so
-	
-	insinto /usr/include/xmms2
-	doins src/include/*/*.h
-	
-	dodoc AUTHORS COPYING TODO README
-}
-
diff --git a/media-sound/xmms2/xmms2-0.1_pre1.ebuild b/media-sound/xmms2/xmms2-0.1_pre1.ebuild
deleted file mode 100644
index 2d1c00c4..00000000
--- a/media-sound/xmms2/xmms2-0.1_pre1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="XMMS2 is a redesign of the XMMS (http://www.xmms.org) music player"
-HOMEPAGE="http://wiki.xmms2.xmms.se/index.php/Main_Page"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-0.1DR1.tar.gz"
-
-LICENSE="LGPL"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="ogg sid python ruby"
-
-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
-	ogg? ( media-libs/libvorbis )
-	sid? ( media-sound/sidplay
-		|| media-libs/resid )
-	python? ( dev-python/pyrex )
-	ruby? ( >=dev-lang/ruby-1.8 )"
-RDEPEND=""
-
-RESTRICT="nomirror"
-S=${WORKDIR}/xmms2-0.1DR1
-
-src_compile()
-{
-	addpredict /usr/lib
-	scons prefix=${D}/usr || die "scons failed"
-}
-
-src_install()
-{
-	addpredict /usr/lib
-	scons PREFIX=${D}/usr install || die "scons install failed"
-}
diff --git a/media-sound/xmms2/xmms2-0.1_pre2.ebuild b/media-sound/xmms2/xmms2-0.1_pre2.ebuild
deleted file mode 100644
index 6e44ad5c..00000000
--- a/media-sound/xmms2/xmms2-0.1_pre2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="XMMS2 is a redesign of the XMMS music player."
-HOMEPAGE="http://wiki.xmms2.xmms.se/"
-
-MY_P="xmms2-0.1DR2"
-SRC_URI="mirror://sourceforge/xmms2/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="curl vorbis sid python ruby flac alsa oss gnome samba"
-
-DEPEND=">=dev-util/scons-0.94
-	>=dev-lang/python-2.2.1
-	>=dev-libs/glib-2.2.0
-	media-sound/madplay
-	=dev-db/sqlite-3.2*
-	curl? ( >=net-misc/curl-7.11.2 )
-	ogg? ( media-libs/libvorbis )
-	sid? (	media-sound/sidplay
-			media-libs/resid )
-	python? ( dev-python/pyrex )
-	ruby? ( >=dev-lang/ruby-1.8 )
-	alsa? ( media-libs/alsa-lib )"
-RDEPEND=""
-
-MY_EXCLUDE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack () {
-	unpack ${A}
-}
-
-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 () {
-	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 Developer Release 2"
-}
diff --git a/media-sound/xmms2/xmms2-0.2.ebuild b/media-sound/xmms2/xmms2-0.2.ebuild
index 40ca5390..e94a850c 100644
--- a/media-sound/xmms2/xmms2-0.2.ebuild
+++ b/media-sound/xmms2/xmms2-0.2.ebuild
@@ -4,7 +4,7 @@
 
 inherit multilib
 
-MY_P="${P}DrBombay"
+MY_P="${P}DrDolittle"
 
 DESCRIPTION="XMMS2 is a redesign of the XMMS music player."
 HOMEPAGE="http://wiki.xmms2.xmms.se/"
@@ -13,17 +13,19 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aac alsa curl flac gnome jack modplug mp3 musepack python oss ruby samba sid speex vorbis"
+IUSE="aac alsa curl ecore flac gnome jack modplug mp3 musepack python oss ruby samba sid speex vorbis"
+RESTRICT="nomirror"
 
 RDEPEND=">=dev-libs/glib-2.6.0
 	>=dev-db/sqlite-3.2.6
 	aac? ( >=media-libs/faad2-2.0 )
 	alsa? ( media-libs/alsa-lib )
 	curl? ( >=net-misc/curl-7.11.2 )
-	modplug? ( media-libs/libmodplug )
+	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 )
@@ -48,7 +50,7 @@ src_unpack() {
 
 src_compile() {
 	local u o MY_EXCLUDE=""
-	for u in aac alsa curl gnome:gnomevfs modplug flac jack mp3:mad \
+	for u in aac alsa curl ecore gnome:gnomevfs modplug flac jack mp3:mad \
 	         musepack oss ruby samba sid speex vorbis ; do
 		o=${u##*:} ; o=${o:-${u}}
 		u=${u%%:*}
diff --git a/media-sound/xmms2/xmms2-0.2_pre0.ebuild b/media-sound/xmms2/xmms2-0.2_pre0.ebuild
deleted file mode 100644
index 9f6aa7b0..00000000
--- a/media-sound/xmms2/xmms2-0.2_pre0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="XMMS2 is a redesign of the XMMS music player."
-HOMEPAGE="http://wiki.xmms2.xmms.se/"
-
-MY_P="xmms2-0.2DrAlban"
-SRC_URI="mirror://sourceforge/xmms2/${MY_P}.tar.bz2"
-#http://puzzle.dl.sourceforge.net/sourceforge/xmms2/xmms2-0.2DrAlban.tar.bz2
-LICENSE="LGPL-2.2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="alsa aac curl fasttrack flac jack mp3 musepack gnome oss ruby samba sid speex vorbis python"
-
-DEPEND=">=dev-util/scons-0.96
-	>=dev-libs/glib-2.2.0
-	>=dev-db/sqlite-3.2.6
-	>=dev-lang/python-2.2.1"
-
-RDEPEND="mp3? ( media-sound/madplay )
-	curl? ( >=net-misc/curl-7.11.2 )
-	ogg? ( media-libs/libvorbis )
-	alsa? ( media-libs/alsa-lib )
-	sid? (	media-sound/sidplay
-			media-libs/resid )
-	aac? ( >=media-libs/faad2-2.0 )
-	musepack? ( media-libs/libmpcdec )
-	fasttrack? ( media-libs/libmodplug )
-	ruby? ( >=dev-lang/ruby-1.8 )
-	python? ( <=sys-devel/gcc-4
-		>=dev-python/pyrex-0.9.3 )
-	jack? ( media-sound/jack )
-	speex? ( media-libs/speex )"
-
-MY_EXCLUDE=""
-RESTRICT="nomirror"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack () {
-	unpack ${A}
-}
-
-src_compile () {
-	cd ${S}
-
-	use alsa      || MY_EXCLUDE="${MY_EXCLUDE} alsa"
-	use aac       || MY_EXCLUDE="${MY_EXCLUDE} aac"
-	use curl      || MY_EXCLUDE="${MY_EXCLUDE} curl"
-	use fasttrack || MY_EXCLUDE="${MY_EXCLUDE} modplug"
-	use flac      || MY_EXCLUDE="${MY_EXCLUDE} flac"
-	use jack      || MY_EXCLUDE="${MY_EXCLUDE} jack"
-	use mp3       || MY_EXCLUDE="${MY_EXCLUDE} mad"
-	use musepack  || MY_EXCLUDE="${MY_EXCLUDE} musepack"
-	use gnome     || MY_EXCLUDE="${MY_EXCLUDE} gnomevfs"
-	use oss       || MY_EXCLUDE="${MY_EXCLUDE} oss"
-	use ruby      || MY_EXCLUDE="${MY_EXCLUDE} ruby"
-	use samba     || MY_EXCLUDE="${MY_EXCLUDE} samba"
-	use sid       || MY_EXCLUDE="${MY_EXCLUDE} sid"
-	use speex     || MY_EXCLUDE="${MY_EXCLUDE} speex"
-	use vorbis    || MY_EXCLUDE="${MY_EXCLUDE} vorbis"
-
-	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 () {
-	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.2 Developer Release DR 2.2"
-}
diff --git a/media-sound/xmms2/xmms2-0.2_pre1.ebuild b/media-sound/xmms2/xmms2-0.2_pre1.ebuild
deleted file mode 100644
index f6141fcb..00000000
--- a/media-sound/xmms2/xmms2-0.2_pre1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="XMMS2 is a redesign of the XMMS music player."
-HOMEPAGE="http://wiki.xmms2.xmms.se/"
-
-MY_P="xmms2-0.2DrBombay"
-SRC_URI="mirror://sourceforge/xmms2/${MY_P}.tar.bz2"
-LICENSE="LGPL-2.2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="alsa aac curl fasttrack flac jack mp3 musepack gnome oss ruby samba sid speex vorbis python"
-
-DEPEND=">=dev-util/scons-0.96
-	>=dev-libs/glib-2.6.0
-	>=dev-db/sqlite-3.2.6
-	>=dev-lang/python-2.2.1"
-
-RDEPEND="mp3? ( media-sound/madplay )
-	curl? ( >=net-misc/curl-7.11.2 )
-	ogg? ( media-libs/libvorbis )
-	alsa? ( media-libs/alsa-lib )
-	sid? (	media-sound/sidplay
-			media-libs/resid )
-	aac? ( >=media-libs/faad2-2.0 )
-	musepack? ( media-libs/libmpcdec )
-	fasttrack? ( media-libs/libmodplug )
-	ruby? ( >=dev-lang/ruby-1.8 )
-	python? ( <=sys-devel/gcc-4
-		>=dev-python/pyrex-0.9.3 )
-	jack? ( media-sound/jack )
-	speex? ( media-libs/speex )"
-
-MY_EXCLUDE=""
-RESTRICT="nomirror"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack () {
-	unpack ${A}
-}
-
-src_compile () {
-	cd ${S}
-
-	use alsa      || MY_EXCLUDE="${MY_EXCLUDE} alsa"
-	use aac       || MY_EXCLUDE="${MY_EXCLUDE} aac"
-	use curl      || MY_EXCLUDE="${MY_EXCLUDE} curl"
-	use fasttrack || MY_EXCLUDE="${MY_EXCLUDE} modplug"
-	use flac      || MY_EXCLUDE="${MY_EXCLUDE} flac"
-	use jack      || MY_EXCLUDE="${MY_EXCLUDE} jack"
-	use mp3       || MY_EXCLUDE="${MY_EXCLUDE} mad"
-	use musepack  || MY_EXCLUDE="${MY_EXCLUDE} musepack"
-	use gnome     || MY_EXCLUDE="${MY_EXCLUDE} gnomevfs"
-	use oss       || MY_EXCLUDE="${MY_EXCLUDE} oss"
-	use ruby      || MY_EXCLUDE="${MY_EXCLUDE} ruby"
-	use samba     || MY_EXCLUDE="${MY_EXCLUDE} samba"
-	use sid       || MY_EXCLUDE="${MY_EXCLUDE} sid"
-	use speex     || MY_EXCLUDE="${MY_EXCLUDE} speex"
-	use vorbis    || MY_EXCLUDE="${MY_EXCLUDE} vorbis"
-
-	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 () {
-	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.2 Developer Release"
-}
diff --git a/media-sound/xmms2/xmms2-0.2_pre3.ebuild b/media-sound/xmms2/xmms2-0.2_pre3.ebuild
deleted file mode 100644
index 4cc6a6b6..00000000
--- a/media-sound/xmms2/xmms2-0.2_pre3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="XMMS2 is a redesign of the XMMS music player."
-HOMEPAGE="http://wiki.xmms2.xmms.se/"
-
-MY_P="xmms2-0.2DrBombay"
-SRC_URI="mirror://sourceforge/xmms2/${MY_P}.tar.bz2"
-LICENSE="LGPL-2.2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="aac alsa curl fasttrack flac gnome jack mp3 musepack python oss ruby samba sid speex vorbis"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-	>=dev-db/sqlite-3.2.6
-	aac? ( >=media-libs/faad2-2.0 )
-	alsa? ( media-libs/alsa-lib )
-	curl? ( >=net-misc/curl-7.11.2 )
-	fasttrack? ( media-libs/libmodplug )
-	flac? ( media-libs/flac )
-	gnome? ( gnome-base/gnome-vfs )
-	jack? ( >=media-sound/jack-0.100.0 )
-	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 )
-	samba? ( net-fs/samba )
-	sid? (	media-sound/sidplay
-			media-libs/resid )
-	speex? ( media-libs/speex )
-	vorbis? ( media-libs/libvorbis )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/python-2.2.1
-	>=dev-util/scons-0.96.90"
-
-MY_EXCLUDE=""
-RESTRICT="nomirror"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack () {
-	unpack ${A}
-}
-
-src_compile () {
-	cd ${S}
-
-	use aac       || MY_EXCLUDE="${MY_EXCLUDE} aac"
-	use alsa      || MY_EXCLUDE="${MY_EXCLUDE} alsa"
-	use curl      || MY_EXCLUDE="${MY_EXCLUDE} curl"
-	use fasttrack || MY_EXCLUDE="${MY_EXCLUDE} modplug"
-	use flac      || MY_EXCLUDE="${MY_EXCLUDE} flac"
-	use gnome     || MY_EXCLUDE="${MY_EXCLUDE} gnomevfs"
-	use jack      || MY_EXCLUDE="${MY_EXCLUDE} jack"
-	use mp3       || MY_EXCLUDE="${MY_EXCLUDE} mad"
-	use musepack  || MY_EXCLUDE="${MY_EXCLUDE} musepack"
-	use oss       || MY_EXCLUDE="${MY_EXCLUDE} oss"
-	use ruby      || MY_EXCLUDE="${MY_EXCLUDE} ruby"
-	use samba     || MY_EXCLUDE="${MY_EXCLUDE} samba"
-	use sid       || MY_EXCLUDE="${MY_EXCLUDE} sid"
-	use speex     || MY_EXCLUDE="${MY_EXCLUDE} speex"
-	use vorbis    || MY_EXCLUDE="${MY_EXCLUDE} vorbis"
-
-	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 () {
-	cd ${S}
-	scons PREFIX=/usr/ MANDIR=/usr/share/man INSTALLDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README
-	scons -c
-}
-
-pkg_postinst () {	
-	ewarn "This is a Developer Release"
-}