old

(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 5 insertions, 114 deletions

diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog
index d9db9ddf9a4b..1980416602e0 100644
--- a/media-sound/quodlibet/ChangeLog
+++ b/media-sound/quodlibet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/quodlibet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.94 2012/12/08 12:33:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.95 2012/12/11 16:45:13 ssuominen Exp $
+
+  11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -quodlibet-2.3.92-r1.ebuild, -files/quodlibet-2.3.92-xine-lib-1.2.0.patch:
+  old
 
   08 Dec 2012; Agostino Sarubbo <ago@gentoo.org> quodlibet-2.4.ebuild:
   Stable for ppc64, wrt bug #420045
diff --git a/media-sound/quodlibet/files/quodlibet-2.3.92-xine-lib-1.2.0.patch b/media-sound/quodlibet/files/quodlibet-2.3.92-xine-lib-1.2.0.patch
deleted file mode 100644
index 14528b1aa3e2..000000000000
--- a/media-sound/quodlibet/files/quodlibet-2.3.92-xine-lib-1.2.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-http://code.google.com/p/quodlibet/issues/detail?id=904
-http://bugs.gentoo.org/show_bug.cgi?id=397919
-
---- quodlibet/player/_xine.py
-+++ quodlibet/player/_xine.py
-@@ -7,18 +7,31 @@
- import sys
- import ctypes
- 
-+_version = 2
- try:
--    _libxine = ctypes.cdll.LoadLibrary('libxine.so.1')
--except (ImportError, OSError), e:
--    raise ImportError, e
-+    _libxine = ctypes.cdll.LoadLibrary('libxine.so.2')
-+except (ImportError, OSError):
-+    _version = 1
-+    try:
-+        _libxine = ctypes.cdll.LoadLibrary('libxine.so.1')
-+    except (ImportError, OSError), e:
-+        raise ImportError, e
- 
- class xine_event_t(ctypes.Structure):
--    _fields_ = [
--        ('type', ctypes.c_int),
--        ('stream', ctypes.c_void_p),
--        ('data', ctypes.c_void_p),
--        ('data_length', ctypes.c_int),
--    ]
-+    if _version == 1:
-+        _fields_ = [
-+            ('type', ctypes.c_int),
-+            ('stream', ctypes.c_void_p),
-+            ('data', ctypes.c_void_p),
-+            ('data_length', ctypes.c_int),
-+        ]
-+    elif _version == 2:
-+        _fields_ = [
-+            ('stream', ctypes.c_void_p),
-+            ('data', ctypes.c_void_p),
-+            ('data_length', ctypes.c_int),
-+            ('type', ctypes.c_int),
-+        ]
- 
- class xine_ui_message_data_t(ctypes.Structure):
-     _fields_ = [
-@@ -122,6 +135,7 @@
- XINE_MSG_AUDIO_OUT_UNAVAILABLE = 11 # none
- XINE_MSG_PERMISSION_ERROR      = 12 # (file name or mrl)
- XINE_MSG_FILE_EMPTY            = 13 # file is empty
-+XINE_MSG_AUTHENTICATION_NEEDED = 14 # (mrl, likely http); added in 1.2
- 
- # xine_t *xine_new(void)
- _libxine.xine_new.restype = ctypes.c_void_p
diff --git a/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild b/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild
deleted file mode 100644
index 3b7dd9c25f93..000000000000
--- a/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild,v 1.5 2012/04/17 09:04:03 ssuominen Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.6 3.* *-jython 2.7-pypy-*"
-
-inherit distutils eutils
-
-DESCRIPTION="audio library tagger, manager, and player for GTK+"
-HOMEPAGE="http://code.google.com/p/quodlibet/"
-SRC_URI="http://quodlibet.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="dbus gstreamer ipod"
-
-COMMON_DEPEND=">=dev-python/pygtk-2.12"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/feedparser
-	>=media-libs/mutagen-1.14
-	gstreamer? (
-		>=dev-python/gst-python-0.10.2:0.10
-		media-libs/gst-plugins-good:0.10
-		media-plugins/gst-plugins-meta:0.10
-		)
-	!gstreamer? ( media-libs/xine-lib )
-	dbus? (
-		app-misc/media-player-info
-		dev-python/dbus-python
-		)
-	ipod? ( media-libs/libgpod[python] )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool"
-REQUIRED_USE="ipod? ( dbus )"
-
-src_prepare() {
-	local qlconfig=${PN}/config.py
-
-	if ! use gstreamer; then
-		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
-	fi
-
-	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
-
-	epatch "${FILESDIR}"/${P}-xine-lib-1.2.0.patch
-
-	distutils_src_prepare
-}
-
-src_install() {
-	distutils_src_install
-	dodoc HACKING NEWS README
-	doicon ${PN}/images/hicolor/64x64/apps/{exfalso,quodlibet}.png
-}