8 files changed, 96 insertions, 233 deletions
diff --git a/media-sound/exaile/ChangeLog b/media-sound/exaile/ChangeLog
index 94e5787d91e7..388d9fb816f9 100644
--- a/media-sound/exaile/ChangeLog
+++ b/media-sound/exaile/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/exaile
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.12 2007/03/27 19:30:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.13 2007/04/06 22:03:44 drac Exp $
+
+*exaile-0.2.9-r1 (06 Apr 2007)
+
+  06 Apr 2007; Samuli Suominen <drac@gentoo.org>
+  -files/exaile-0.2.9_beta1-unicode.patch, +files/exaile-0.2.x-strip.patch,
+  -exaile-0.2.9_beta1-r1.ebuild, -exaile-0.2.9.ebuild,
+  +exaile-0.2.9-r1.ebuild:
+  General clean; outlook, deps. Remove old versions.
 
 *exaile-0.2.9 (27 Mar 2007)
 
diff --git a/media-sound/exaile/exaile-0.2.9-r1.ebuild b/media-sound/exaile/exaile-0.2.9-r1.ebuild
new file mode 100644
index 000000000000..d2175a0c9790
--- /dev/null
+++ b/media-sound/exaile/exaile-0.2.9-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.9-r1.ebuild,v 1.1 2007/04/06 22:03:44 drac Exp $
+
+inherit eutils python toolchain-funcs
+
+GVER="0.10"
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+"
+HOMEPAGE="http://www.exaile.org/"
+SRC_URI="http://www.exaile.org/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac alsa cdparanoia flac gnome ipod libnotify libsexy mad musepack ogg
+	oss serpentine streamripper vorbis"
+
+RDEPEND=">=dev-python/pygtk-2.8.6
+	>=dev-python/pysqlite-2
+	>=media-libs/mutagen-1.6
+	dev-python/elementtree
+	>=gnome-base/librsvg-2
+	libnotify? ( dev-python/notify-python )
+	libsexy? ( dev-python/sexy-python )
+	gnome? ( >=dev-python/gnome-python-extras-2.14
+		>=media-plugins/gst-plugins-gconf-${GVER}
+		>=media-plugins/gst-plugins-gnomevfs-${GVER} )
+	serpentine? ( app-cdr/serpentine )
+	streamripper? ( media-sound/streamripper )
+	>=media-libs/gstreamer-${GVER}
+	>=media-libs/gst-plugins-good-${GVER}
+	>=dev-python/gst-python-${GVER}
+	musepack? ( >=media-plugins/gst-plugins-musepack-${GVER} )
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-${GVER} )
+	flac? ( >=media-plugins/gst-plugins-flac-${GVER} )
+	aac? ( >=media-plugins/gst-plugins-faad-${GVER} )
+	alsa? ( >=media-plugins/gst-plugins-alsa-${GVER} )
+	oss? ( >=media-plugins/gst-plugins-oss-${GVER} )
+	mad? ( >=media-plugins/gst-plugins-mad-${GVER} )
+	ogg? ( >=media-plugins/gst-plugins-ogg-${GVER} )
+	cdparanoia? ( >=media-plugins/gst-plugins-cdparanoia-${GVER}
+		dev-python/cddb-py )
+	ipod? ( >=media-libs/libgpod-0.4
+		>=media-plugins/gst-plugins-faad-${GVER} )"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ipod && ! built_with_use media-libs/libgpod python ; then
+		eerror "libgpod has to be built with python support"
+		die "libgpod python use-flag not set"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.2.x-strip.patch
+	python_version
+	sed -i -e "s:hon2.4:hon${PYVER}:" mmkeys/Makefile
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc testing TODO
+	exeinto /usr/share/${PN}
+	doexe scripts/*
+}
diff --git a/media-sound/exaile/exaile-0.2.9.ebuild b/media-sound/exaile/exaile-0.2.9.ebuild
deleted file mode 100644
index 2d9435d7e84f..000000000000
--- a/media-sound/exaile/exaile-0.2.9.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.9.ebuild,v 1.1 2007/03/27 19:30:06 drac Exp $
-
-inherit eutils python toolchain-funcs
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="a media player aiming to be similar to KDE's AmaroK, but for GTK"
-HOMEPAGE="http://www.exaile.org/"
-SRC_URI="http://www.exaile.org/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac alsa cdaudio flac gnome ipod libnotify libsexy mad musepack ogg
-	oss serpentine streamripper vorbis"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=dev-python/pygtk-2.8.6
-	>=dev-python/pysqlite-2
-	>=media-libs/gstreamer-0.10
-	>=media-libs/gst-plugins-good-0.10
-	>=dev-python/gst-python-0.10
-	>=media-libs/mutagen-1.6
-	dev-python/elementtree
-	dev-python/dbus-python
-	alsa? ( >=media-plugins/gst-plugins-alsa-0.10 )
-	oss? ( >=media-plugins/gst-plugins-oss-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	aac? ( >=media-plugins/gst-plugins-faad-0.10 )
-	libnotify? ( dev-python/notify-python )
-	libsexy? ( dev-python/sexy-python )
-	musepack? ( >=media-plugins/gst-plugins-musepack-0.10 )
-	gnome? ( dev-python/gnome-python-extras
-		media-plugins/gst-plugins-gconf
-		>=media-plugins/gst-plugins-gnomevfs-0.10 )
-	ipod? ( >=media-libs/libgpod-0.3.2-r1
-		>=media-plugins/gst-plugins-faad-0.10 )
-	cdaudio? ( media-plugins/gst-plugins-cdparanoia
-	dev-python/cddb-py )
-	serpentine? ( app-cdr/serpentine )
-	streamripper? ( media-sound/streamripper )
-	gnome-base/librsvg"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ipod && ! built_with_use media-libs/libgpod python ; then
-		eerror "libgpod has to be built with python support"
-		die "libgpod python use-flag not set"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.2.8-strip.patch
-
-	python_version
-	sed -i -e "s:python2.4:python${PYVER}:" mmkeys/Makefile
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc testing TODO
-	insinto /usr/share/exaile
-	doins -r scripts
-	fperms u+x /usr/share/exaile/scripts/*
-}
diff --git a/media-sound/exaile/exaile-0.2.9_beta1-r1.ebuild b/media-sound/exaile/exaile-0.2.9_beta1-r1.ebuild
deleted file mode 100644
index 343ffc56ec4b..000000000000
--- a/media-sound/exaile/exaile-0.2.9_beta1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-0.2.9_beta1-r1.ebuild,v 1.2 2007/03/09 18:00:54 drac Exp $
-
-inherit eutils python toolchain-funcs
-
-MY_P=${PN}_${PV} ; MY_P=${MY_P/_beta1/b}
-
-DESCRIPTION="a media player aiming to be similar to KDE's AmaroK, but for GTK"
-HOMEPAGE="http://www.exaile.org/"
-SRC_URI="http://www.exaile.org/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac alsa cdaudio flac gnome ipod libnotify libsexy mad musepack ogg
-	oss serpentine streamripper vorbis"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=dev-python/pygtk-2.8.6
-	>=dev-python/pysqlite-2
-	>=media-libs/gstreamer-0.10
-	>=media-libs/gst-plugins-good-0.10
-	>=dev-python/gst-python-0.10
-	>=media-libs/mutagen-1.6
-	dev-python/elementtree
-	dev-python/dbus-python
-	alsa? ( >=media-plugins/gst-plugins-alsa-0.10 )
-	oss? ( >=media-plugins/gst-plugins-oss-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	aac? ( >=media-plugins/gst-plugins-faad-0.10 )
-	libnotify? ( dev-python/notify-python )
-	libsexy? ( dev-python/sexy-python )
-	musepack? ( >=media-plugins/gst-plugins-musepack-0.10 )
-	gnome? ( dev-python/gnome-python-extras
-		media-plugins/gst-plugins-gconf
-		>=media-plugins/gst-plugins-gnomevfs-0.10 )
-	ipod? ( >=media-libs/libgpod-0.3.2-r1
-		>=media-plugins/gst-plugins-faad-0.10 )
-	cdaudio? ( media-plugins/gst-plugins-cdparanoia
-	dev-python/cddb-py )
-	serpentine? ( app-cdr/serpentine )
-	streamripper? ( media-sound/streamripper )
-	gnome-base/librsvg"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ipod && ! built_with_use media-libs/libgpod python ; then
-		eerror "libgpod has to be built with python support"
-		die "libgpod python use-flag not set"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.2.8-strip.patch
-	epatch "${FILESDIR}"/${P}-unicode.patch
-	python_version
-	sed -i -e "s:python2.4:python${PYVER}:" mmkeys/Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/media-sound/exaile/files/digest-exaile-0.2.9 b/media-sound/exaile/files/digest-exaile-0.2.9-r1
index 7fa98eb6bbe1..7fa98eb6bbe1 100644
--- a/media-sound/exaile/files/digest-exaile-0.2.9
+++ b/media-sound/exaile/files/digest-exaile-0.2.9-r1
diff --git a/media-sound/exaile/files/digest-exaile-0.2.9_beta1-r1 b/media-sound/exaile/files/digest-exaile-0.2.9_beta1-r1
deleted file mode 100644
index 2bae28bad51b..000000000000
--- a/media-sound/exaile/files/digest-exaile-0.2.9_beta1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 145418e89b621df838b9936effcda703 exaile_0.2.9b.tar.gz 789660
-RMD160 e26d4fbb6c265026d71c80d6754deacbed57da01 exaile_0.2.9b.tar.gz 789660
-SHA256 e21eb72f5048755137117c1e720bee8a3eaf7aaf707c90e5e8308ee56f2e8059 exaile_0.2.9b.tar.gz 789660
diff --git a/media-sound/exaile/files/exaile-0.2.9_beta1-unicode.patch b/media-sound/exaile/files/exaile-0.2.9_beta1-unicode.patch
deleted file mode 100644
index 89acf190b923..000000000000
--- a/media-sound/exaile/files/exaile-0.2.9_beta1-unicode.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: xl/media/__init__.py
-===================================================================
---- xl/media/__init__.py	(revision 2146)
-+++ xl/media/__init__.py	(working copy)
-@@ -117,7 +117,7 @@
- 
-         # This would be more nicely written using conditional expressions
-         # but that is Python 2.5 only
--	if type(title) is unicode:
-+        if type(title) is unicode:
-             self._title = title
-         else:
-             self._title = unicode(title, encoding)
-Index: xl/player.py
-===================================================================
---- xl/player.py	(revision 2146)
-+++ xl/player.py	(working copy)
-@@ -302,11 +302,11 @@
-                 self.on_sync_message))
- 
-             if '://' not in uri: 
--                if not os.path.isfile(uri):
-+                if not os.path.isfile(uri.encode('latin1')):
-                     raise Exception('Specified file does not exist')
- 
-                 uri = 'file://%s' % uri
--            self.playbin.set_property('uri', uri)
-+            self.playbin.set_property('uri', uri.encode('latin1'))
- 
-         self.playbin.set_state(gst.STATE_PLAYING)
- 
-Index: xl/panels.py
-===================================================================
---- xl/panels.py	(revision 2146)
-+++ xl/panels.py	(working copy)
-@@ -378,8 +378,8 @@
-             loc = ["device_%s://%s" % (driver_name, 
-                 urllib.quote(l.loc)) for l in loc]
-         else:
--            loc = [urllib.quote(str(l.loc)) for l in loc]
--            
-+            loc = [urllib.quote(l.loc.encode('latin1')) for l in loc]
-+        
-         selection.set_uris(loc)
- 
-     def append_recursive(self, iter, add):
-@@ -2721,7 +2721,7 @@
-         """
- 
-         songs = self.get_selected_songs()
--        uris = [song.loc for song in songs]
-+        uris = [urllib.quote(song.loc.encode('latin1')) for song in songs]
- 
-         sel.set_uris(uris)
- 
-Index: xl/trackslist.py
-===================================================================
---- xl/trackslist.py	(revision 2146)
-+++ xl/trackslist.py	(working copy)
-@@ -153,7 +153,7 @@
-         # first, check to see if they dropped a folder
-         copy = loc[:]
-         for l in copy:
--            l = urllib.unquote(l)
-+            l = urllib.unquote_plus(l)
-             if os.path.isdir(l.replace("file://", "")):
-                 # in this case, it is a folder
-                 for root, dirs, files in os.walk(l.replace("file://", '')):
-@@ -174,7 +174,7 @@
- 
-         for l in loc:
-             l = l.replace("file://", "")
--            l = urllib.unquote(l)
-+            l = urllib.unquote_plus(l)
-             m = re.search(r'^device_(\w+)://', l)
-             if m:
-                 song = self.exaile.device_panel.get_song(l)
diff --git a/media-sound/exaile/files/exaile-0.2.x-strip.patch b/media-sound/exaile/files/exaile-0.2.x-strip.patch
new file mode 100644
index 000000000000..677da34cf2ad
--- /dev/null
+++ b/media-sound/exaile/files/exaile-0.2.x-strip.patch
@@ -0,0 +1,11 @@
+diff -ur exaile_0.2.8.orig/mmkeys/Makefile exaile_0.2.8/mmkeys/Makefile
+--- exaile_0.2.8.orig/mmkeys/Makefile	2006-11-01 02:11:34.000000000 +0200
++++ exaile_0.2.8/mmkeys/Makefile	2007-02-04 13:40:43.000000000 +0200
+@@ -7,7 +7,6 @@
+ 
+ mmkeys.so: mmkeyspy.o mmkeys.o mmkeysmodule.o
+ 	$(CC) $(LDFLAGS) -shared $^ -o $@
+-	strip mmkeys.so
+ 
+ DEFS=`pkg-config --variable=defsdir pygtk-2.0`
+