Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 81 insertions, 197 deletions

diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog
index ae8ca0d947e5..b70420f9c81f 100644
--- a/media-sound/quodlibet/ChangeLog
+++ b/media-sound/quodlibet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/quodlibet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.68 2009/05/13 07:32:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.69 2009/07/16 15:47:07 ssuominen Exp $
+
+*quodlibet-2.1 (16 Jul 2009)
+
+  16 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +quodlibet-2.1.ebuild:
+  Version bump wrt #277120, thanks to Chris Burroughs for reporting.
 
 *quodlibet-2.0-r3 (13 May 2009)
 
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index 583b98291047..cffa330ef4fc 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,6 +1,4 @@
-AUX quodlibet-2.0-click.patch 809 RMD160 7d3225627b7e8e372061e132644f5528dd770b2f SHA1 1aaefc23d61e95af30b9db853be0138da159c1d6 SHA256 408fb3bc7d27bab0d4035288e89ff07ef8162e5f5de3f25067b691ad35af6e82
-AUX quodlibet-2.0-python26.patch 998 RMD160 b9d5eb6f8a80cad840ee432e256b2d4041c40283 SHA1 3a2a0bc9e97fad56ab8b948c0895ba9825574aa9 SHA256 f024e0c6054b96ef396695d3709cd2174b82081b3a494f95accf0a2c5b21c6f2
-DIST quodlibet-2.0.tar.gz 842921 RMD160 f2276a52abb947741c1c519d696de66a92b7c6de SHA1 93d378234feae798c65452085add0b46a2440be4 SHA256 1c1e28a58e0a52055fc0f0ecb833088be6b9bcfbebb6c8ef9ff9e11ea3f1393a
-EBUILD quodlibet-2.0-r3.ebuild 4765 RMD160 9756bea259c67267a20398477b0be48c994fa55a SHA1 7178407b5bf51db1722bb00dedd7507c118aec0d SHA256 5571fbb429f78252a77589e9245cbf849260fa0dcacaecfd5871d54c1ea7448a
-MISC ChangeLog 11867 RMD160 90b08497ee37864475e9c75dcc4777a36e31e2b7 SHA1 6f24b7e048424f8f0e76431e6e34e98ed508f3b0 SHA256 0e0d011edc18ed185bc5e336781980c7ebef0e4d3d9b7d4f5e48e6144e999af9
+DIST quodlibet-2.1.tar.gz 848911 RMD160 349b9ac2f913e83a2f3216e1f804c9cd8b41766f SHA1 15a40c054955d1ad539432a265b2c96225b864c2 SHA256 f3cea852b8bc26941ebe9a757b88f202491d0cc19f021ce66aaedb3ba788bade
+EBUILD quodlibet-2.1.ebuild 2464 RMD160 26d2cc55175b9760450b3ab4fe5f7baf2e4fae55 SHA1 5b91e2d2132b011145b1fb9a754df8b6bd76187c SHA256 302363219b965060c6449e68edaa7d880285ec25f0a06b075620c66688f5099c
+MISC ChangeLog 12044 RMD160 010b44746133bbb7d23d06f4b086c5125f4492f4 SHA1 3e08ecf90bf0458a0dcfa69601f6a6dc483e517c SHA256 2f3ee9e0fcf3e2a7de5362c468b0b556b885d12e17d306e08881836d90ca79ba
 MISC metadata.xml 859 RMD160 aa77d424dd4dc782f9a8f40bb9cc73f2e4fa8cbc SHA1 9499ad7f2e2f79373401c829a928b94044f4c6a2 SHA256 cbb835079f0c1ec0f238956b82bacad9c3ece15c29ed5b80f696d4defd3b5c61
diff --git a/media-sound/quodlibet/files/quodlibet-2.0-click.patch b/media-sound/quodlibet/files/quodlibet-2.0-click.patch
deleted file mode 100644
index 51c375540811..000000000000
--- a/media-sound/quodlibet/files/quodlibet-2.0-click.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Crash when right clicked on headers. Fixed in upstream subversion.
-
-http://code.google.com/p/quodlibet/issues/detail?id=14
-http://bugs.gentoo.org/show_bug.cgi?id=246115
-
-diff -ur quodlibet-2.0.orig/quodlibet/qltk/songlist.py quodlibet-2.0/quodlibet/qltk/songlist.py
---- quodlibet-2.0.orig/quodlibet/qltk/songlist.py	2008-09-14 06:19:55.000000000 +0300
-+++ quodlibet-2.0/quodlibet/qltk/songlist.py	2009-05-13 10:16:23.000000000 +0300
-@@ -815,7 +815,7 @@
-             menu.append(item)
-             submenu = gtk.Menu()
-             item.set_submenu(submenu)
--            for header in sorted(zip(map(tag, group), group)):
-+            for header in sorted(zip(map(util.tag, group), group)):
-                 add_header_toggle(submenu, header, header[1] in current_set)
- 
-         sep = gtk.SeparatorMenuItem()
diff --git a/media-sound/quodlibet/files/quodlibet-2.0-python26.patch b/media-sound/quodlibet/files/quodlibet-2.0-python26.patch
deleted file mode 100644
index 9d2a9fadca40..000000000000
--- a/media-sound/quodlibet/files/quodlibet-2.0-python26.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Steven Robertson <nihilismwow@gmail.com>
-https://bugs.gentoo.org/show_bug.cgi?id=240188
-http://code.google.com/p/quodlibet/issues/detail?id=27
-
-
-Index: quodlibet/gdist/core.py
-===================================================================
---- quodlibet/gdist/core.py	(revision 4331)
-+++ quodlibet/gdist/core.py	(working copy)
-@@ -10,7 +10,7 @@
- This module exists to avoid circular imports within gdist.
- """
- 
--import os
-+import os, subprocess
- 
- from distutils.core import Command
- 
-@@ -26,8 +26,11 @@
-         self.po_directory = self.distribution.po_directory
- 
-     def capture(self, args):
--        write, read = os.popen2(args, mode="r")
--        return read.read()
-+        p = subprocess.Popen(args, stdout=subprocess.PIPE)
-+        ret = p.wait()
-+        if ret != 0:
-+            raise SystemExit("External program %s exited with error %d." % (args[0], ret))
-+        return p.stdout.read()
- 
-     def check_po(self):
-         """Exit if translation is needed and not available"""
diff --git a/media-sound/quodlibet/quodlibet-2.0-r3.ebuild b/media-sound/quodlibet/quodlibet-2.0-r3.ebuild
deleted file mode 100644
index 2142e4ae3718..000000000000
--- a/media-sound/quodlibet/quodlibet-2.0-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.0-r3.ebuild,v 1.1 2009/05/13 07:29:43 ssuominen Exp $
-
-EAPI=2
-NEED_PYTHON=2.4.4
-
-inherit distutils python eutils
-
-DESCRIPTION="Quod Libet is a GTK+-based audio player written in Python."
-HOMEPAGE="http://code.google.com/p/quodlibet/"
-SRC_URI="http://quodlibet.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-# Enable gstreamer by default, bug 254729
-IUSE="aac alsa dbus esd flac gnome +gstreamer hal ipod mad musepack oss
-trayicon tta vorbis wma xine"
-
-COMMON_DEPEND=">=dev-python/pygtk-2.12"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/mutagen-1.14
-	gstreamer? (
-		>=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 )
-		flac? ( >=media-plugins/gst-plugins-flac-0.10.2 )
-		aac? ( >=media-plugins/gst-plugins-faad-0.10.1 )
-		musepack? ( >=media-plugins/gst-plugins-musepack-0.10.3 )
-		wma? ( >=media-plugins/gst-plugins-ffmpeg-0.10.1
-			>=media-libs/gst-plugins-ugly-0.10.2 )
-		tta? ( >=media-libs/gst-plugins-bad-0.10.3 )
-
-		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 )
-	)
-	xine? ( >=media-libs/xine-lib-1.1
-		dev-python/ctypes )
-	gnome? ( dev-python/gnome-python-extras
-		>=media-plugins/gst-plugins-gconf-0.10.3
-		>=media-plugins/gst-plugins-gnomevfs-0.10.2
-		dev-python/feedparser )
-	hal? ( sys-apps/hal )
-	dbus? ( >=dev-python/dbus-python-0.71 )
-	ipod? ( >=media-libs/libgpod-0.5.2[python] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool"
-
-PDEPEND="trayicon? ( media-plugins/quodlibet-trayicon )"
-
-pkg_setup() {
-	if ! use gstreamer && ! use xine; then
-		eerror "You must have either gstreamer or xine USE flag enabled."
-		die "No backend USE flags enabled."
-	fi
-}
-
-src_prepare() {
-	# The backend is configured as gstbe by default.
-	if use gstreamer && use xine; then
-		elog ""
-		elog "You have both backend USE flags (gstreamer and xine) enabled."
-		elog "Gstreamer is considered to be more stable of the two, so we have"
-		elog "selected it as your default backend."
-	elif use gstreamer; then
-		elog "Gstreamer backend selected."
-	else
-		sed -i -e "s,^          \"backend\": \"gstbe\",          \"backend\": \"xinebe\"," quodlibet/config.py && \
-			elog "Xine backend selected."
-	fi
-	elog "You can change the backend by editing the ~/.${PN}/config file."
-
-	# no gst-plugins-gconf, attempt to guess the proper pipeline value. Bug #133043, #146728.
-	if ! use gnome; then
-		local sinktype="alsasink"
-
-		use esd  && sinktype="esdsink"
-		use oss  && sinktype="osssink"
-		use alsa && sinktype="alsasink"
-
-		elog "Setting the default pipeline to ${sinktype}"
-
-		sed -i -e "s,^          \"pipeline\": \"\",          \"pipeline\": \"${sinktype}\"," quodlibet/config.py
-	fi
-	epatch "${FILESDIR}/${P}-python26.patch" #240188
-	epatch "${FILESDIR}/${P}-click.patch"
-}
-
-src_install() {
-	${python} setup.py install --prefix="${D}/usr" --no-compile "$@" || die
-
-	DDOCS="CHANGELOG KNOWN_BUGS MAINTAINERS PKG-INFO CONTRIBUTORS TODO NEWS"
-	DDOCS="${DDOCS} Change* MANIFEST* README* AUTHORS"
-
-	python_version
-	for ext in png svg; do
-		for prog in quodlibet exfalso; do
-			dosym /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/images/${prog}.${ext} /usr/share/pixmaps/${prog}.${ext}
-		done
-	done
-
-	for doc in ${DDOCS}; do
-		[ -s "$doc" ] && dodoc $doc
-	done
-}
-
-pkg_postinst() {
-	if ! use mad; then
-		elog ""
-		elog "You do not have the 'mad' USE flag enabled."
-		elog "gst-plugins-mad, which is required for mp3 playback, may"
-		elog "not be installed. For mp3 support, enable the 'mad'"
-		elog "USE flag and emerge =media-sound/${P}."
-	fi
-
-	if ! use gnome; then
-		elog ""
-		elog "You do not have the 'gnome' USE flag enabled."
-		elog "media-plugins/gst-plugins-gnomevfs may not be installed,"
-		elog "so the proper pipeline won't be automatically selected."
-		elog "We've tried to select the proper pipeline based on your"
-		elog "USE flags, but if we guessed wrong you may have to set"
-		elog "'pipeline = ' in your ~/.quodlibet/config file to one"
-		elog "of the following: alsasink, osssink, esdsink. To enable"
-		elog "automatic selection of the proper pipeline, enable the"
-		elog "'gnome' USE flag and emerge =media-sound/${P}."
-	fi
-
-	elog ""
-	elog "Installing Quod Libet from an ebuild is not supported"
-	elog "upstream. If you encounter any problems, file bugs on"
-	elog "bugs.gentoo.org. DO NOT USE THE UPSTREAM BUG SYSTEM."
-	elog ""
-
-	distutils_pkg_postinst
-}
diff --git a/media-sound/quodlibet/quodlibet-2.1.ebuild b/media-sound/quodlibet/quodlibet-2.1.ebuild
new file mode 100644
index 000000000000..a65c1345ba71
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-2.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.1.ebuild,v 1.1 2009/07/16 15:47:07 ssuominen Exp $
+
+EAPI=2
+NEED_PYTHON=2.6
+inherit distutils python eutils
+
+DESCRIPTION="Quod Libet is a GTK+-based audio player written in Python."
+HOMEPAGE="http://code.google.com/p/quodlibet/"
+SRC_URI="http://quodlibet.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aac +alsa dbus esd flac gnome +gstreamer hal ipod mad musepack oss trayicon tta vorbis wma xine"
+
+COMMON_DEPEND=">=dev-python/pygtk-2.12"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/mutagen-1.16
+	gstreamer? ( media-libs/gst-plugins-good:0.10
+		dev-python/gst-python:0.10
+		mad? ( media-plugins/gst-plugins-mad:0.10 )
+		vorbis? ( media-plugins/gst-plugins-vorbis:0.10
+			media-plugins/gst-plugins-ogg:0.10 )
+		flac? ( media-plugins/gst-plugins-flac:0.10 )
+		aac? ( media-plugins/gst-plugins-faad:0.10 )
+		musepack? ( media-plugins/gst-plugins-musepack:0.10 )
+		wma? ( media-plugins/gst-plugins-ffmpeg:0.10
+			media-libs/gst-plugins-ugly:0.10 )
+		tta? ( =media-libs/gst-plugins-bad-0.10* )
+		alsa? ( media-plugins/gst-plugins-alsa:0.10 )
+		oss? ( media-plugins/gst-plugins-oss:0.10 )
+		esd? ( media-plugins/gst-plugins-esd:0.10 ) )
+	xine? ( >=media-libs/xine-lib-1.1
+		dev-python/ctypes )
+	gnome? ( dev-python/gnome-python-extras
+		gstreamer? ( media-plugins/gst-plugins-gconf:0.10
+			media-plugins/gst-plugins-gnomevfs:0.10 )
+		dev-python/feedparser )
+	hal? ( sys-apps/hal )
+	dbus? ( >=dev-python/dbus-python-0.71 )
+	ipod? ( >=media-libs/libgpod-0.5.2[python] )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool"
+PDEPEND="trayicon? ( media-plugins/quodlibet-trayicon )"
+
+pkg_setup() {
+	if ! use gstreamer && ! use xine; then
+		eerror "You must have either gstreamer or xine USE flag enabled."
+		die "No backend USE flag enabled."
+	fi
+}
+
+src_prepare() {
+	if ! use gstreamer && use xine; then
+		sed -i -e 's/gstbe/xinebe/' quodlibet/config.py || die "sed failed"
+	fi
+
+	if ! use gnome && use alsa; then
+		sed -e 's/"gst_pipeline": ""/"gst_pipeline": "alsasink"/' \
+			-i quodlibet/config.py || die "sed failed"
+	fi
+}
+
+src_install() {
+	${python} setup.py install --prefix="${D}/usr" \
+		--no-compile "$@" || die "${python} setup.py install failed"
+
+	dodoc HACKING NEWS README
+	doicon quodlibet/images/{exfalso,quodlibet}.{png,svg}
+}