old

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 20 insertions, 118 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/Manifest b/media-sound/quodlibet/Manifest
index 8b1fa23a3a6e..1cdaaaf6ee31 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,7 +1,18 @@
-AUX quodlibet-2.3.92-xine-lib-1.2.0.patch 1634 SHA256 5d2865ba09a4bb31788ad6635a625630fef3f50d00a319e73927fa1c43dcbad1 SHA512 693dad8fca652a854d3e23b06042167d466e5b86f7f4877a0fe22d4eb3f7db76c0f2cca9d1f30b42c82203f287b2616fd48de2cc667bd3db384be0bf1861e63a WHIRLPOOL 08e97924a61f8eca40d89b19c61fe153ad7375757150340779eb184583fea77b61cf04b63cb0bc4efed171c9a70f0cac42d7132e41f99a14bf093dbb61a26436
-DIST quodlibet-2.3.92.tar.gz 1086791 SHA256 0c64fb32eeafa73bb38cba3e111f8f27bb13c5bad4b031ab3df6b0422474645d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST quodlibet-2.4.tar.gz 1091868 SHA256 b1f2eefe82c885c5194eed6496aa3a473e8e9679cdd4bf147bbc816012e6b5e8 SHA512 e097761fd453ab5aa79f84c7009554ce0d157bfd45975f0c53f646b9de7bd9961dcb1ba2982d62e0798db657085d2abb93faaf9c5387f96be2878e6d96f1bb62 WHIRLPOOL dcff56155945ba45e9395e535727c473c43e2b370f32fa7556e2b369710cb2bbf14836bcb7e4890251bf1aa32b5dcc61c53a7c86cb0ebea8a6e6604680a4702b
-EBUILD quodlibet-2.3.92-r1.ebuild 1500 SHA256 42b712f6ef3750e241a7ee8e0d54ddf50ba9e51de601bab7fa853bb50997e6f4 SHA512 10163d5a7a9f344c07757e4398a0ec87f8c534511067a0b83a4769c3faa96dd23c79d97cf29532692d58c992c3de0658d4ed0ccc7b0c5d2756a9a315ee2ce25b WHIRLPOOL c29539f0ca292fbb5bc171922f415f48052bdc89749f8ecef8a98421d5b6c096f2d86a408ae9f7445e64ab2e1bc5f8d02128f0ce1d0e538654b94be01f9e3bec
 EBUILD quodlibet-2.4.ebuild 1575 SHA256 eb799ad9a069fc35ef950b7d788f205939b70ee82c77db3599222ffdf6f0cf22 SHA512 7e0e6e70679dfc4b95cf260ee0ae277f8e4884d1bf302603981b526e172c3f2df823a066fb09751c35c8dbbe5dd50a60feac90ce02a4950843f0d1b1fdd54f5e WHIRLPOOL c4bf8a3f7089712c9339c07e3af89413dfb469336aa470cf22f2e3ea1e33c87d88d4dd86e8f14f410ebe4d98d0f2a98413be64ade64453f4f2ccf3f8af0d4a20
-MISC ChangeLog 15553 SHA256 11b160c231e624e941d8e96495f4968a844b3320b29a4d54bafc1afe1774949c SHA512 0fc83f5d1011bc71d16a685e57eec84fbf97a535ec86c9b1c8a841e0498cb0bf994881e2502e6e139bc93a08fbe26543f4147441ffa3ad05d840db5208c23109 WHIRLPOOL 9240e4ca9a908ffa1d909a9e352a6840537391d02ac92eb37f932bb330d30002a36c250e6a2027ed6b706e773cbd0761963e7f34d209c2a2411729f25f3fbb97
+MISC ChangeLog 15697 SHA256 3e8eafe6461493ca6181f3a75253e529ed849e068ba5e9272311090669985598 SHA512 0aea7c7a6edaeeca7437a268cecc4c9946594915f88365b5eac81e58f2a803ba903a37e24bc10e8d23d468251f73d26179ed0cde32037e00b747b5b4ba637c63 WHIRLPOOL fae8d57a84fa8d1bac1520e85565b8f08fec03fa67da0d0abd9bb79b906301909d19978d604061e97c6ecdae8dab70d2f21a3736a01e9ea2aa60ad09b8b944a9
 MISC metadata.xml 717 SHA256 5b3886ac2a706da49f89cf719e8c443c0df15f5c508fdadadd22856fd05e19df SHA512 1d6b91cbd523896ce7313ab78e5499d517ca2e04b76010acaa64830fbe155ee02dc55395893f48377d93b0ed9cc1389646e34336536ce14ff3b97d837e143e4f WHIRLPOOL 090a5475ecefc2fa3a5f58e86effdd82c93e9b12f3d8bbd73152ea23f9924e1e8ad0783c404d3c194e81cf125f7307c828cb19b07015e653a95e626219fc6afd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQx2MaAAoJEEdUh39IaPFNmcwH/3rwranU/Rt7jYFjyTXrnF7q
+OmKcKSNFumBJhm1ouaSRhvC9lEbkKXTHuXLGbDXU0wYspRMMQD7PVAwPW5a5TJdG
+BX9kBGnXcvMegMc3wUk4Oeck8k4F2BRRawvEYPLIQ1+47YMJT83qKOL6BGbGb0jL
+6nbNPathAs2MW+BLzbH+/9FuXFCxNBpvLuhmeQU5vfwPkhKRB8jvXh2XYhQ1+kGw
+CE9o/xSw/bt2KvEgxNGXe7QsTzbqyu2YhObFIkb1Sq/BoPgQNleTiif6CHHoZ61h
+vbcC9COmcxQrQBB07W1KMNAZa+gVMhsb/6KTDVECNEJja04iO25ad5iz1ZJu0cc=
+=Oi9a
+-----END PGP SIGNATURE-----
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
-}