Added a patch to allow Quod Libet to work with any version of ctypes.

Package-Manager: portage-2.0.54

5 files changed, 151 insertions, 2 deletions

diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog
index eacec20e4694..5d6179cc6405 100644
--- a/media-sound/quodlibet/ChangeLog
+++ b/media-sound/quodlibet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/quodlibet
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.21 2006/04/05 13:50:46 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.22 2006/04/05 20:55:38 tcort Exp $
+
+*quodlibet-0.19.1-r1 (05 Apr 2006)
+
+  05 Apr 2006; Thomas Cort <tcort@gentoo.org>
+  +files/quodlibet-0.19.1-ctypes.patch, +quodlibet-0.19.1-r1.ebuild:
+  Added a patch to allow Quod Libet to work with any version of ctypes.
 
 *quodlibet-0.19.1 (05 Apr 2006)
 
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index d13df9598f7f..f422dfab2036 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,14 +1,17 @@
-MD5 ee6f3e8b07052f427bcf3f0134337329 ChangeLog 3753
+MD5 87c2eae0a17e63537ead276fe582c39a ChangeLog 3977
 MD5 704b13a70e462cea62a9f57f66a7330e files/digest-quodlibet-0.11-r1 66
 MD5 9fe2cf94756025872c8fd235c6371c70 files/digest-quodlibet-0.19-r1 66
 MD5 9fe2cf94756025872c8fd235c6371c70 files/digest-quodlibet-0.19-r2 66
 MD5 1ec70a8114b68ed7ec71b3757c002ab8 files/digest-quodlibet-0.19.1 68
+MD5 1ec70a8114b68ed7ec71b3757c002ab8 files/digest-quodlibet-0.19.1-r1 68
 MD5 a1c9620cc4536cfdb260002b24be843a files/quodlibet-0.17.1-multilibfix.patch 303
 MD5 3cd68f8e542c31c865020dfbd316c4f0 files/quodlibet-0.19-alsa.patch 519
 MD5 d6ed6587f0c986bb6d195a431ee26575 files/quodlibet-0.19-esd.patch 518
 MD5 b05966282b90b48bed11240b6b732138 files/quodlibet-0.19-oss.patch 518
+MD5 fd52db4ce4d1ea6d4c0fbe27c37fbe37 files/quodlibet-0.19.1-ctypes.patch 2540
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 80b6e1e0c43599a4b17d8b92e18ca3a9 quodlibet-0.11-r1.ebuild 867
 MD5 b45e4134795bf868ac083bc727f588d3 quodlibet-0.19-r1.ebuild 2068
 MD5 12ba54aebe60d2f22350a80a00f090ca quodlibet-0.19-r2.ebuild 2010
+MD5 1b7b51b69afec8314ec63dfde6268a36 quodlibet-0.19.1-r1.ebuild 2155
 MD5 64e7e4e9a811979d2509ad2432ea487f quodlibet-0.19.1.ebuild 2130
diff --git a/media-sound/quodlibet/files/digest-quodlibet-0.19.1-r1 b/media-sound/quodlibet/files/digest-quodlibet-0.19.1-r1
new file mode 100644
index 000000000000..ad125937ab08
--- /dev/null
+++ b/media-sound/quodlibet/files/digest-quodlibet-0.19.1-r1
@@ -0,0 +1 @@
+MD5 9a8f2e5bb8b1f71876ab7d4d09fa5079 quodlibet-0.19.1.tar.gz 533248
diff --git a/media-sound/quodlibet/files/quodlibet-0.19.1-ctypes.patch b/media-sound/quodlibet/files/quodlibet-0.19.1-ctypes.patch
new file mode 100644
index 000000000000..8b25f167bec2
--- /dev/null
+++ b/media-sound/quodlibet/files/quodlibet-0.19.1-ctypes.patch
@@ -0,0 +1,67 @@
+diff -urN quodlibet-0.19.1.orig/formats/mod.py quodlibet-0.19.1/formats/mod.py
+--- quodlibet-0.19.1.orig/formats/mod.py	2006-04-05 15:48:36.000000000 -0400
++++ quodlibet-0.19.1/formats/mod.py	2006-04-05 15:53:38.000000000 -0400
+@@ -15,7 +15,11 @@
+     '.mtm', '.okt', '.s3m', '.stm', '.ult', '.gdm', '.xm']
+ try:
+     import ctypes
+-    _modplug = ctypes.cdll.LoadLibrary("libmodplug.so.0")
++
++    if 'load' in dir(ctypes.cdll):
++        _modplug = ctypes.cdll.load("libmodplug.so.0")
++    else:
++        _modplug = ctypes.cdll.LoadLibrary("libmodplug.so.0")
+ except: extensions = []
+ else:
+     _modplug.ModPlug_GetName.restype = ctypes.c_char_p
+diff -urN quodlibet-0.19.1.orig/formats/mp4.py quodlibet-0.19.1/formats/mp4.py
+--- quodlibet-0.19.1.orig/formats/mp4.py	2006-04-05 15:48:36.000000000 -0400
++++ quodlibet-0.19.1/formats/mp4.py	2006-04-05 15:52:26.000000000 -0400
+@@ -14,7 +14,11 @@
+ 
+ try:
+     import ctypes
+-    _mp4v2 = ctypes.cdll.LoadLibrary("libmp4v2.so.0")
++
++    if 'load' in dir(ctypes.cdll):
++        _mp4v2 = ctypes.cdll.load("libmp4v2.so.0")
++    else:
++        _mp4v2 = ctypes.cdll.LoadLibrary("libmp4v2.so.0")
+ except: extensions = []
+ else:
+     _mp4v2.MP4Read.restype = ctypes.c_void_p
+diff -urN quodlibet-0.19.1.orig/formats/mpc.py quodlibet-0.19.1/formats/mpc.py
+--- quodlibet-0.19.1.orig/formats/mpc.py	2006-04-05 15:48:36.000000000 -0400
++++ quodlibet-0.19.1/formats/mpc.py	2006-04-05 15:54:38.000000000 -0400
+@@ -12,8 +12,13 @@
+ 
+ try:
+     import ctypes
+-    _libc = ctypes.cdll.LoadLibrary("libc.so.6")
+-    _mpcdec = ctypes.cdll.LoadLibrary("libmpcdec.so.3")
++
++    if 'load' in dir(ctypes.cdll):
++        _libc = ctypes.cdll.load("libc.so.6")
++        _mpcdec = ctypes.cdll.load("libmpcdec.so.3")
++    else:
++        _libc = ctypes.cdll.LoadLibrary("libc.so.6")
++        _mpcdec = ctypes.cdll.LoadLibrary("libmpcdec.so.3")
+ except: extensions = []
+ else:
+     try: gst.element_factory_make('musepackdec')
+diff -urN quodlibet-0.19.1.orig/formats/wavpack.py quodlibet-0.19.1/formats/wavpack.py
+--- quodlibet-0.19.1.orig/formats/wavpack.py	2006-04-05 15:48:36.000000000 -0400
++++ quodlibet-0.19.1/formats/wavpack.py	2006-04-05 15:55:25.000000000 -0400
+@@ -11,7 +11,11 @@
+ 
+ try:
+     import ctypes
+-    _wavpack = ctypes.cdll.LoadLibrary("libwavpack.so.0")
++
++    if 'load' in dir(ctypes.cdll):
++        _wavpack = ctypes.cdll.load("libwavpack.so.0")
++    else:
++        _wavpack = ctypes.cdll.LoadLibrary("libwavpack.so.0")
+ except: extensions = []
+ else:
+     try: gst.element_factory_make('wavpackdec')
diff --git a/media-sound/quodlibet/quodlibet-0.19.1-r1.ebuild b/media-sound/quodlibet/quodlibet-0.19.1-r1.ebuild
new file mode 100644
index 000000000000..49368a47335f
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-0.19.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-0.19.1-r1.ebuild,v 1.1 2006/04/05 20:55:38 tcort Exp $
+
+inherit eutils python
+
+DESCRIPTION="Quod Libet is a new kind of audio player."
+HOMEPAGE="http://www.sacredchao.net/quodlibet/"
+SRC_URI="http://www.sacredchao.net/~piman/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="aac alsa esd flac gnome mad musepack oss vorbis"
+
+DEPEND=">=virtual/python-2.3
+	>=dev-python/pygtk-2.8
+	>=x11-libs/gtk+-2.8
+	>=media-libs/mutagen-1.1
+	>=media-libs/gstreamer-0.10.3
+	>=media-libs/gst-plugins-base-0.10.3
+	>=media-libs/gst-plugins-good-0.10.2
+	>=dev-python/gst-python-0.10.2
+	mad? ( >=media-plugins/gst-plugins-mad-0.10.2 )
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.2
+		>=media-plugins/gst-plugins-ogg-0.10.2
+		<dev-python/pyvorbis-1.4* )
+	flac? ( >=media-plugins/gst-plugins-flac-0.10.2 )
+	aac? ( media-libs/faad2
+		>=media-plugins/gst-plugins-faad-0.10.1
+		dev-python/ctypes )
+	musepack? ( >=media-plugins/gst-plugins-musepack-0.10.0
+		>=media-libs/gst-plugins-bad-0.10.1
+		media-libs/libmpcdec
+		dev-python/ctypes )
+	alsa? ( >=media-plugins/gst-plugins-alsa-0.10.2 )
+	oss? ( >=media-plugins/gst-plugins-oss-0.10.2 )
+	esd? ( >=media-plugins/gst-plugins-esd-0.10.2 )
+	gnome? ( dev-python/gnome-python-extras
+		>=media-plugins/gst-plugins-gnomevfs-0.10.2
+		dev-python/feedparser )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-0.17.1-multilibfix.patch
+	epatch ${FILESDIR}/${PN}-0.19.1-ctypes.patch
+
+	# set the default pipeline (alsasink|osssink|esdsink)
+	( use alsa && epatch ${FILESDIR}/${PN}-0.19-alsa.patch ) ||
+	( use oss  && epatch ${FILESDIR}/${PN}-0.19-oss.patch  ) ||
+	( use esd  && epatch ${FILESDIR}/${PN}-0.19-esd.patch  )
+}
+
+src_compile() {
+	emake extensions || die "emake extensions failed"
+}
+
+src_install() {
+	make PREFIX=/usr DESTDIR=${D} libdir=$(get_libdir) install ||
+		die "install failed"
+	dodoc README NEWS
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}