Fix a regression from 0.2.8 which effected unicode filenames. Thanks to #gentoo.fi...

Package-Manager: portage-2.1.2-r11

diff --git a/media-sound/exaile/ChangeLog b/media-sound/exaile/ChangeLog
index d06e78bfd870818cb7bd45d391a9dbb2c16d7e7f..0ce7e0e47996582487195ff0cbfa23d1d53cd627 100644 (file)
--- a/media-sound/exaile/ChangeLog
+++ b/media-sound/exaile/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2007/02/25 12:24:48 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/ChangeLog,v 1.10 2007/02/25 19:07:48 drac Exp $
+
+*exaile-0.2.9_beta1-r1 (25 Feb 2007)
+
+  25 Feb 2007; Samuli Suominen <drac@gentoo.org>
+  +files/exaile-0.2.9_beta1-unicode.patch, +exaile-0.2.9_beta1-r1.ebuild:
+  Fix a regression from 0.2.8 which effected unicode filenames.
 
   25 Feb 2007; Samuli Suominen <drac@gentoo.org> exaile-0.2.9_beta1.ebuild:
   Remove USE fam and gamin dep because it's not used.

diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index c848c6bc818d2c50efe3c92c7c54731a41f8e50f..b483e00a0ed0884abbc1bf48cd9d9f5372baa7f3 100644 (file)
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -2,20 +2,28 @@ AUX exaile-0.2.8-strip.patch 386 RMD160 5e8190e703de0d59386a932394fcce6d4a479886
 MD5 db41796431d7aca5b429db3ef3465a72 files/exaile-0.2.8-strip.patch 386
 RMD160 5e8190e703de0d59386a932394fcce6d4a479886 files/exaile-0.2.8-strip.patch 386
 SHA256 842b3d627b9fe528f540a0b6a46b52a8db32cd578b1f2e1430a4b6b364bbf097 files/exaile-0.2.8-strip.patch 386
+AUX exaile-0.2.9_beta1-unicode.patch 2722 RMD160 790db352f8c183b900d63c0e645e8343f70d831c SHA1 32d4de3a67a7076b4034839ae45c2f41297c340d SHA256 93412cc94fa9d9d1c43fb2af6cb17288cc4a0dbd7a7c79aa2cac8bc69e1a36f8
+MD5 5e5c404ceb4d05a783bc153bd0f225a9 files/exaile-0.2.9_beta1-unicode.patch 2722
+RMD160 790db352f8c183b900d63c0e645e8343f70d831c files/exaile-0.2.9_beta1-unicode.patch 2722
+SHA256 93412cc94fa9d9d1c43fb2af6cb17288cc4a0dbd7a7c79aa2cac8bc69e1a36f8 files/exaile-0.2.9_beta1-unicode.patch 2722
 DIST exaile_0.2.8.tar.gz 371231 RMD160 414cf041cad28ad2f301d6c7ece1f2dcac21fef8 SHA1 12f9773796331c06792a95e7af700275bfa6b3de SHA256 917cec0b34c7f42466d9d58dbfac3ce4f3791f5066e7c4b5f727e5c7f8bec53e
 DIST exaile_0.2.9b.tar.gz 789660 RMD160 e26d4fbb6c265026d71c80d6754deacbed57da01 SHA1 3914b89dde02dad3b43492a7e9707f04b290e427 SHA256 e21eb72f5048755137117c1e720bee8a3eaf7aaf707c90e5e8308ee56f2e8059
 EBUILD exaile-0.2.8.ebuild 2242 RMD160 5d02f9bcb212785565d994b04ced0fabe57a248c SHA1 db9c8d7240435106e4d31c1f8a755e90a303d689 SHA256 82874003aede2f9a860366b42fbcc5caa580e46b4e2110d26b516ad8ed8b4fdd
 MD5 76e61fbf2d8be1b30b0a0431b33d8fae exaile-0.2.8.ebuild 2242
 RMD160 5d02f9bcb212785565d994b04ced0fabe57a248c exaile-0.2.8.ebuild 2242
 SHA256 82874003aede2f9a860366b42fbcc5caa580e46b4e2110d26b516ad8ed8b4fdd exaile-0.2.8.ebuild 2242
+EBUILD exaile-0.2.9_beta1-r1.ebuild 2307 RMD160 57cb80e403e75d62aa0e89f0bc0ca84ebc4a4021 SHA1 4c977b293c395f13cbb75b00b367795790a9f512 SHA256 b090e9e1540f54cc0442ae6cc272aa279e44855aadf9f63f19522bfde495495e
+MD5 b973c8a382fa64c81a14d29c84e78bca exaile-0.2.9_beta1-r1.ebuild 2307
+RMD160 57cb80e403e75d62aa0e89f0bc0ca84ebc4a4021 exaile-0.2.9_beta1-r1.ebuild 2307
+SHA256 b090e9e1540f54cc0442ae6cc272aa279e44855aadf9f63f19522bfde495495e exaile-0.2.9_beta1-r1.ebuild 2307
 EBUILD exaile-0.2.9_beta1.ebuild 2229 RMD160 a0ccedf04cdcdcea247a4efd59aab34babec7020 SHA1 84b5cace3ec9c0b4c9b1de0a60120e8363ef0657 SHA256 60afea95377a7bd78782f41fc3580bb7c62b03ad99a722b767b084664372f4bd
 MD5 804569a4613835dbbaddc478b721d0fa exaile-0.2.9_beta1.ebuild 2229
 RMD160 a0ccedf04cdcdcea247a4efd59aab34babec7020 exaile-0.2.9_beta1.ebuild 2229
 SHA256 60afea95377a7bd78782f41fc3580bb7c62b03ad99a722b767b084664372f4bd exaile-0.2.9_beta1.ebuild 2229
-MISC ChangeLog 1483 RMD160 9456700db218a928c298855462eacfb863a36465 SHA1 d79f9bb083b3a7d3755e74c06f9d1de62e332044 SHA256 9a5cf72e319b8c375718e6f0e718c7451f75f181b4d5de113f549c618bfddcf8
-MD5 a1905d72c6b0dc0ce88b42f66624aaad ChangeLog 1483
-RMD160 9456700db218a928c298855462eacfb863a36465 ChangeLog 1483
-SHA256 9a5cf72e319b8c375718e6f0e718c7451f75f181b4d5de113f549c618bfddcf8 ChangeLog 1483
+MISC ChangeLog 1710 RMD160 a57ab2e6f8f4dfd0920de7b5faef054d833a3e39 SHA1 04ab5f508562a4d0e9fa5807be67a73ae96b4f5b SHA256 5b11da487b01403287aba0d3c5234ff461da3c1be31065c67297932cf711a86a
+MD5 4658f9a7ab62fbe3c3ce4184301df3d8 ChangeLog 1710
+RMD160 a57ab2e6f8f4dfd0920de7b5faef054d833a3e39 ChangeLog 1710
+SHA256 5b11da487b01403287aba0d3c5234ff461da3c1be31065c67297932cf711a86a ChangeLog 1710
 MISC metadata.xml 214 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f SHA1 ec7c7723b21b430e43c31acc7176045413af0225 SHA256 690c22b23be5f116a9ab2986b9fdae7b4f53788c4a8fafb369f3f636a3b619ba
 MD5 97f43390489104c86df538d5759098f0 metadata.xml 214
 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f metadata.xml 214
@@ -26,3 +34,6 @@ SHA256 bf1562a4f6d1e461957e04baa96acab662570e070aa2ff286960ab15dc6b1296 files/di
 MD5 92021bf67f5a869af3d460a0da983e30 files/digest-exaile-0.2.9_beta1 241
 RMD160 9eb22875e3188e1ae067475199db7cdcc0158578 files/digest-exaile-0.2.9_beta1 241
 SHA256 aecfd7bb89fedb04098ed6b7a8119a93603ac7f3c9f52cf02f8b2655c641d83c files/digest-exaile-0.2.9_beta1 241
+MD5 92021bf67f5a869af3d460a0da983e30 files/digest-exaile-0.2.9_beta1-r1 241
+RMD160 9eb22875e3188e1ae067475199db7cdcc0158578 files/digest-exaile-0.2.9_beta1-r1 241
+SHA256 aecfd7bb89fedb04098ed6b7a8119a93603ac7f3c9f52cf02f8b2655c641d83c files/digest-exaile-0.2.9_beta1-r1 241

diff --git a/media-sound/exaile/exaile-0.2.9_beta1-r1.ebuild b/media-sound/exaile/exaile-0.2.9_beta1-r1.ebuild
new file mode 100644 (file)
index 0000000..7ecb1bf
--- /dev/null
+++ b/media-sound/exaile/exaile-0.2.9_beta1-r1.ebuild
@@ -0,0 +1,74 @@
+# 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.1 2007/02/25 19:07:48 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
+       >=media-plugins/gst-plugins-gnomevfs-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 )
+       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_beta1-r1 b/media-sound/exaile/files/digest-exaile-0.2.9_beta1-r1
new file mode 100644 (file)
index 0000000..2bae28b
--- /dev/null
+++ b/media-sound/exaile/files/digest-exaile-0.2.9_beta1-r1
@@ -0,0 +1,3 @@
+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
new file mode 100644 (file)
index 0000000..89acf19
--- /dev/null
+++ b/media-sound/exaile/files/exaile-0.2.9_beta1-unicode.patch
@@ -0,0 +1,77 @@
+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)