From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 9 Jan 2007 20:46:33 +0000 (+0000)
Subject: Adding a patch to catch exception when hal is not running, bug #161139
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=893453a348d999bba5936f638f88121507c23a24;p=gentoo.git

Adding a patch to catch exception when hal is not running, bug #161139
Package-Manager: portage-2.1.2_rc4-r7
---

diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog
index f7b615e1a324..1fc49913f2b0 100644
--- a/media-sound/quodlibet/ChangeLog
+++ b/media-sound/quodlibet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/quodlibet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.46 2007/01/06 20:17:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.47 2007/01/09 20:46:33 aballier Exp $
+
+*quodlibet-0.24-r1 (09 Jan 2007)
+
+  09 Jan 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/quodlibet-0.24-hal.patch, +quodlibet-0.24-r1.ebuild:
+  Adding a patch to catch exception when hal is not running, bug #161139
 
 *quodlibet-0.24 (06 Jan 2007)
 
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index e981334519f0..1e6f78ec64e7 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -5,6 +5,10 @@ AUX quodlibet-0.23.1-python25.patch 11209 RMD160 228f6f70b12dba75f4d88d01a98ec2e
 MD5 58a14ab3b881b006415f94f6735b26e6 files/quodlibet-0.23.1-python25.patch 11209
 RMD160 228f6f70b12dba75f4d88d01a98ec2e33de821d6 files/quodlibet-0.23.1-python25.patch 11209
 SHA256 b5fd16a939bf2abadaae6925e7f6d2feda2c0d550ab9b33cf0950bd9f3471da8 files/quodlibet-0.23.1-python25.patch 11209
+AUX quodlibet-0.24-hal.patch 824 RMD160 4e4487ce2dadf9bc6a41cb39e1a6cb4802c11a70 SHA1 6677ad0546fa4c05ff8bcfdf307db4df277f568f SHA256 4adbbff03d84d20c0e1a7a37981089758886c2bd023830973d249d87807b3111
+MD5 986a7ac0c7e7288c00b18a452008dbaf files/quodlibet-0.24-hal.patch 824
+RMD160 4e4487ce2dadf9bc6a41cb39e1a6cb4802c11a70 files/quodlibet-0.24-hal.patch 824
+SHA256 4adbbff03d84d20c0e1a7a37981089758886c2bd023830973d249d87807b3111 files/quodlibet-0.24-hal.patch 824
 AUX quodlibet-0.24-makefile.patch 583 RMD160 8203546e637281342eed8118c23187e47bad49c6 SHA1 4619649966592c188689ef81db2a6b37baffa317 SHA256 782ea65485e85e9d52191364c80144160b2cc33f925bcd36a1f2284118f25358
 MD5 b84eb3fb28d325a538ea4f1709a1e9c0 files/quodlibet-0.24-makefile.patch 583
 RMD160 8203546e637281342eed8118c23187e47bad49c6 files/quodlibet-0.24-makefile.patch 583
@@ -15,14 +19,18 @@ EBUILD quodlibet-0.23.1-r1.ebuild 4034 RMD160 35e1fe9088df74e93675a9d989f4bb9629
 MD5 5edebbbfab2431aafbd60c86dbfab9ad quodlibet-0.23.1-r1.ebuild 4034
 RMD160 35e1fe9088df74e93675a9d989f4bb9629f4bd8c quodlibet-0.23.1-r1.ebuild 4034
 SHA256 b0bcc123d9d9b1ddb6310cdfdded75159ad1f1429ab2c8e4ed763783ee4685be quodlibet-0.23.1-r1.ebuild 4034
+EBUILD quodlibet-0.24-r1.ebuild 4084 RMD160 e84dd7f4720c9d0de3f87fd9a25bcb419f3df49f SHA1 86ffb4bc19bc3795922968269b13b5101e211c13 SHA256 a11a3694ae80e6a72c6965ea56b30c129dff736430f490d167a0702e66616410
+MD5 742612811c85e6e1a8ce1e990f42deb1 quodlibet-0.24-r1.ebuild 4084
+RMD160 e84dd7f4720c9d0de3f87fd9a25bcb419f3df49f quodlibet-0.24-r1.ebuild 4084
+SHA256 a11a3694ae80e6a72c6965ea56b30c129dff736430f490d167a0702e66616410 quodlibet-0.24-r1.ebuild 4084
 EBUILD quodlibet-0.24.ebuild 4017 RMD160 bd6648a0a474c7d0e54ac09e129082cbb5da6881 SHA1 0b1caa2f65842ae4f12236c775ade6afdb4608cc SHA256 0dce79e417047098180a638df33c927987712cd64e1f80dd4329d465061b1678
 MD5 43d0770dfc1f52bc8d0be28511bf9f24 quodlibet-0.24.ebuild 4017
 RMD160 bd6648a0a474c7d0e54ac09e129082cbb5da6881 quodlibet-0.24.ebuild 4017
 SHA256 0dce79e417047098180a638df33c927987712cd64e1f80dd4329d465061b1678 quodlibet-0.24.ebuild 4017
-MISC ChangeLog 8717 RMD160 25868e583888c4f7cc1daed29d40fc3bc27bdcef SHA1 81ad6a62e77fb36c18a92a105fe8c15283f6d122 SHA256 652ea64990249d23fd7a86b1a6fc9263ebbbe809e41b598fa9dfa7fd0d8b0483
-MD5 db09144bfc20b37b9f8364bd34a6462a ChangeLog 8717
-RMD160 25868e583888c4f7cc1daed29d40fc3bc27bdcef ChangeLog 8717
-SHA256 652ea64990249d23fd7a86b1a6fc9263ebbbe809e41b598fa9dfa7fd0d8b0483 ChangeLog 8717
+MISC ChangeLog 8939 RMD160 082bad868abf076167d18d305feb874f4da5fae8 SHA1 73c4407a65a41ddbb395304a17505f9c837cb4cd SHA256 43dd8d0d16f8bb15792858e488ba83cc1785a743d484ece00ca2426c5c56bf63
+MD5 207fb9b74797e62c1b7b0d0eaa6afe3e ChangeLog 8939
+RMD160 082bad868abf076167d18d305feb874f4da5fae8 ChangeLog 8939
+SHA256 43dd8d0d16f8bb15792858e488ba83cc1785a743d484ece00ca2426c5c56bf63 ChangeLog 8939
 MISC metadata.xml 744 RMD160 dc40c6015ca8f3069e0f2f58df8d1235b479756a SHA1 dd66baefd0ae6cfb7afa7f4f46f97dcc67f4c617 SHA256 f819f84833247761ab1f99f2a933eb9af9875daa971f69d87138a1fee381cd7b
 MD5 10a5efe7c3476d69729db9532e53b27e metadata.xml 744
 RMD160 dc40c6015ca8f3069e0f2f58df8d1235b479756a metadata.xml 744
@@ -33,10 +41,13 @@ SHA256 4d8812cd5865aeda32b8194664e8f1a7834afee8f52ea745094876bc177abe6c files/di
 MD5 0f1679b6b9b568607f506e19c500bd0f files/digest-quodlibet-0.24 244
 RMD160 128f241869476086e88cb678f74f3759d7410e13 files/digest-quodlibet-0.24 244
 SHA256 f33deb0e3a180ec295f742f20898b066a7026bb5cfd5af7e44019b8c8e7ae8e0 files/digest-quodlibet-0.24 244
+MD5 0f1679b6b9b568607f506e19c500bd0f files/digest-quodlibet-0.24-r1 244
+RMD160 128f241869476086e88cb678f74f3759d7410e13 files/digest-quodlibet-0.24-r1 244
+SHA256 f33deb0e3a180ec295f742f20898b066a7026bb5cfd5af7e44019b8c8e7ae8e0 files/digest-quodlibet-0.24-r1 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFoAPgvFcC4BYPU0oRAuEoAKCsRv//vEv1qiiwhLTLCeonhR/7vACdEefS
-6v/QPdTN03YFOTJjReEXxQQ=
-=4inP
+iD8DBQFFo/8vvFcC4BYPU0oRAt/oAKCThtGfGxWTnS+W7GV3RlA8MwvKWACffuCj
+LnUozMIRCLHrws8FAhzg4yI=
+=o/CT
 -----END PGP SIGNATURE-----
diff --git a/media-sound/quodlibet/files/digest-quodlibet-0.24-r1 b/media-sound/quodlibet/files/digest-quodlibet-0.24-r1
new file mode 100644
index 000000000000..c3ff4b385dc2
--- /dev/null
+++ b/media-sound/quodlibet/files/digest-quodlibet-0.24-r1
@@ -0,0 +1,3 @@
+MD5 39718994ee234d0c442d9db330d7445a quodlibet-0.24.tar.gz 615554
+RMD160 b4fec7495b081abc92faf74a746c4f43c66f1ead quodlibet-0.24.tar.gz 615554
+SHA256 758d726fa57b177d574dc01141609df3415287611db073415230f1ac4520fd5e quodlibet-0.24.tar.gz 615554
diff --git a/media-sound/quodlibet/files/quodlibet-0.24-hal.patch b/media-sound/quodlibet/files/quodlibet-0.24-hal.patch
new file mode 100644
index 000000000000..1c373cb97912
--- /dev/null
+++ b/media-sound/quodlibet/files/quodlibet-0.24-hal.patch
@@ -0,0 +1,24 @@
+--- browsers/media.py	2006-10-09 01:34:00.000000000 +0200
++++ browsers/media.py.new	2007-01-09 21:32:43.000000000 +0100
+@@ -143,12 +143,15 @@
+ 
+     @classmethod
+     def init(klass, library):
+-        devices._hal.connect_to_signal(
+-            'DeviceAdded', klass.__hal_device_added)
+-        devices._hal.connect_to_signal(
+-            'DeviceRemoved', klass.__hal_device_removed)
+-        for udi in devices.discover():
+-            klass.__hal_device_added(udi)
++	try:
++		devices._hal.connect_to_signal(
++				'DeviceAdded', klass.__hal_device_added)
++	        devices._hal.connect_to_signal(
++        	    'DeviceRemoved', klass.__hal_device_removed)
++	        for udi in devices.discover():
++        	    klass.__hal_device_added(udi)
++	except:
++		print "Hal not found"
+ 
+     @classmethod
+     def devices(klass):
diff --git a/media-sound/quodlibet/quodlibet-0.24-r1.ebuild b/media-sound/quodlibet/quodlibet-0.24-r1.ebuild
new file mode 100644
index 000000000000..7a572fad6d13
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-0.24-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-0.24-r1.ebuild,v 1.1 2007/01/09 20:46:33 aballier Exp $
+
+inherit eutils python
+
+DESCRIPTION="Quod Libet is a GTK+-based audio player written in Python."
+HOMEPAGE="http://www.sacredchao.net/quodlibet/"
+SRC_URI="http://www.sacredchao.net/~piman/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="aac alsa dbus esd flac gnome hal mad mmkeys musepack oss trayicon vorbis"
+
+DEPEND=">=virtual/python-2.4.3-r1
+	trayicon? ( >=dev-python/pygtk-2.8 )
+	mmkeys? ( >=dev-python/pygtk-2.8 )"
+
+RDEPEND="${DEPEND}
+	>=dev-python/pygtk-2.8
+	>=media-libs/mutagen-1.6
+	>=media-libs/gst-plugins-good-0.10.2
+	>=dev-python/gst-python-0.10.2
+	hal? ( sys-apps/hal )
+	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
+		>=dev-python/ctypes-0.9.9.6 )
+	musepack? ( >=media-plugins/gst-plugins-musepack-0.10.0
+		>=dev-python/ctypes-0.9.9.6 )
+	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-gconf-0.10.3
+		>=media-plugins/gst-plugins-gnomevfs-0.10.2
+		dev-python/feedparser )
+	dbus? ( || ( >=dev-python/dbus-python-0.71
+	( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) ) )"
+
+PDEPEND="trayicon? ( media-plugins/quodlibet-trayicon )"
+
+pkg_setup() {
+	if use dbus && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus python ; then
+		eerror "dbus is missing python support. Please add 'python'"
+		eerror "to your USE flags, and re-emerge sys-apps/dbus"
+		die "dbus needs python support"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# multilib fix
+	sed -i -e "s,^TODEP = lib/quodlibet,TODEP = \$(libdir)/quodlibet," Makefile
+
+	# 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}\"," config.py
+	fi
+
+	epatch "${FILESDIR}/${P}-makefile.patch" || die "epatch failed"
+	epatch "${FILESDIR}/${P}-hal.patch"
+}
+
+src_compile() {
+	if use trayicon ; then
+		emake _trayicon.so || die "emake _trayicon.so failed"
+	fi
+
+	if use mmkeys ; then
+		emake _mmkeys.so   || die "emake _mmkeys.so failed"
+	fi
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" libdir="$(get_libdir)" install || die "install failed"
+	dodoc README NEWS
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+
+	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 ""
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}