Apply fedora patch to workaround hangs when pulseaudio has problems, RDEPEND on gnome-base/gsettings-desktop-schemas to work ok with gnome-session-2.32.1-r3, remove all .la files (bug #366071 by Stephan Friedrichs, thanks a lot to Jonathan Callen for his explanation. Remove old.

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

4 files changed, 58 insertions, 15 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 0d5a84903cbc..5b62d3642f8c 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libcanberra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.71 2011/07/21 17:26:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.72 2011/09/12 10:16:37 pacho Exp $
+
+*libcanberra-0.28-r5 (12 Sep 2011)
+
+  12 Sep 2011; Pacho Ramos <pacho@gentoo.org> -libcanberra-0.28-r4.ebuild,
+  +libcanberra-0.28-r5.ebuild, +files/libcanberra-0.28-workaround-hang.patch:
+  Apply fedora patch to workaround hangs when pulseaudio has problems, RDEPEND
+  on gnome-base/gsettings-desktop-schemas to work ok with
+  gnome-session-2.32.1-r3, remove all .la files (bug #366071 by Stephan
+  Friedrichs, thanks a lot to Jonathan Callen for his explanation. Remove old.
 
 *libcanberra-0.28-r4 (21 Jul 2011)
 *libcanberra-0.28-r3 (21 Jul 2011)
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index 0bd354a25ff2..2fc7d5ad3a32 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -4,17 +4,18 @@ Hash: SHA1
 AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c4701f63b1b4614f48d94d03440af7155f119 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8
 AUX libcanberra-0.28-revert-gsettings.patch 1356 RMD160 e837084a1baeb18ced29cfa23534fb2ac8e8f4f4 SHA1 230b308e2f357484cb7c2e6e3198b5958a880d30 SHA256 4101ba4c2975bc111333c833f52a7a450f9044d7ed9002bfe6a48b6632c86739
 AUX libcanberra-0.28-underlinking.patch 1485 RMD160 e0d7899a300ad7e97db39634a21f860f1c615e65 SHA1 d5e8b47d785732f964c9d56bd52def4ad13e1d50 SHA256 3798873e8895602159b0df11f45e806c28056a7f3c3820a0664ed1e6cf25a8a4
+AUX libcanberra-0.28-workaround-hang.patch 849 RMD160 e941604819356cbfab245b9fafecf62dfdcd96a2 SHA1 ab674ad48e2d915dd335303130bd0053fcf53bce SHA256 ffcac176507075d76ca360302b53a45228df785f689e95302b48200a20e4dda4
 DIST libcanberra-0.26.tar.gz 463209 RMD160 f58fc2cfa4b35f6a6b2577057b969977f7de3b5d SHA1 31a1cb8757e5da39b4cdc06e523d011578d7a3e3 SHA256 4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982
 DIST libcanberra-0.28.tar.gz 487276 RMD160 a351f048376d4c66bc0c1612188e8ffbfcec136b SHA1 2a41dae039df1fea98cfb71bd7ca34e57b6e8091 SHA256 eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c
 EBUILD libcanberra-0.26.ebuild 1883 RMD160 3efd491b964ae9348c2f0ecd551a14530f50469a SHA1 c1992cf8b87dd10135fff8e66d5c70cb2d71fe2f SHA256 4098ab29cdbfeb3255df7316110416f58a0cf2ebaca8a88fa4ff5f5160ab8ad6
 EBUILD libcanberra-0.28-r3.ebuild 2381 RMD160 aa459f26a450f2660103255605a2ca3d841313af SHA1 8563f26b87c065f0b3931b11b286b1a61f5d7364 SHA256 ba4a1752f2a8cbdf767efbd26ad08e7bb47a2c837ff302ffe708ae86d896efda
-EBUILD libcanberra-0.28-r4.ebuild 2261 RMD160 ad25cb54cf58f1217c66daf2c177c28dff5ac5fb SHA1 2543f7e484cf846ff7a6b70e8dae8eac76b28710 SHA256 1336efc656a7d7322dcad6ab98f35d0055d649fe3f7f3ceaadf417b0b0157e09
-MISC ChangeLog 11702 RMD160 185ecf3d8712683f6c6b8accdbf36b79be98100c SHA1 becff76dcc871728c6a6479d8bccd6cfb6be700b SHA256 df9ba6ec42d577a570c77b9194f3f1eca76ea5c7f4e678aac0b66587cad37dd4
+EBUILD libcanberra-0.28-r5.ebuild 2677 RMD160 e14bbfe178ed9092b35d245b58d4e65985ad1551 SHA1 b07026e903d6df3160e8ee55eb1ac888cdccfa38 SHA256 0945463630f1a0f42adfe60878908519ed255e17898d80030189ac0d986bdac7
+MISC ChangeLog 12180 RMD160 b4a65ccda32a6100d052841743b4121af7c9f527 SHA1 87e89becc78ad5c7582f1d4f48c914704973c475 SHA256 59dda166389ae4bdd766aa8e02e5b9d6b726a7df0f503359c1fd79763d1139ba
 MISC metadata.xml 1542 RMD160 9870e70050f5f19e19be5c965b03d65b71faae4e SHA1 1d401136554c5142a95eaef76ca236ef828d7550 SHA256 937a49bfb06b48512919df4237fabf66d40794144843790337f884961bdcf1c9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4oYUwACgkQCaWpQKGI+9RwLwCbB499W0GBt69NUtbpy3ptvl2i
-nywAnRVRJb4zrMB+De79TN5OvMc180zc
-=gbEf
+iEUEARECAAYFAk5t3AoACgkQCaWpQKGI+9Sd3wCWPit0ID/2cNOPsyzukRMe4Wku
+7wCffPdPIVYgfvIOKxojxwC0UlzLCAc=
+=8tKR
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libcanberra/files/libcanberra-0.28-workaround-hang.patch b/media-libs/libcanberra/files/libcanberra-0.28-workaround-hang.patch
new file mode 100644
index 000000000000..bc84ce30b41e
--- /dev/null
+++ b/media-libs/libcanberra/files/libcanberra-0.28-workaround-hang.patch
@@ -0,0 +1,28 @@
+From 151ddf4a0d6f4db39ccabf78b083a4343623bbc7 Mon Sep 17 00:00:00 2001
+From: Christopher Aillon <caillon@redhat.com>
+Date: Sat, 5 Mar 2011 11:03:31 -0800
+Subject: [PATCH] Workaround a hang if there are server problems
+
+https://bugs.freedesktop.org/show_bug.cgi?id=35024
+---
+ src/pulse.c |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/src/pulse.c b/src/pulse.c
+index d4225d1..8b4188b 100644
+--- a/src/pulse.c
++++ b/src/pulse.c
+@@ -312,10 +312,6 @@ static void context_state_cb(pa_context *pc, void *userdata) {
+                         }
+ 
+                         p->subscribed = FALSE;
+-
+-                        /* If we managed to connect once, then let's try to
+-                         * reconnect, and pass NOFAIL */
+-                        context_connect(c, TRUE);
+                 }
+         }
+ 
+-- 
+1.7.4.1
+
diff --git a/media-libs/libcanberra/libcanberra-0.28-r4.ebuild b/media-libs/libcanberra/libcanberra-0.28-r5.ebuild
index d3afa35d94a8..d82f3463c238 100644
--- a/media-libs/libcanberra/libcanberra-0.28-r4.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.28-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.28-r4.ebuild,v 1.1 2011/07/21 17:26:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.28-r5.ebuild,v 1.1 2011/09/12 10:16:37 pacho Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
+IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
 
 COMMON_DEPEND="media-libs/libvorbis
 	>=sys-devel/libtool-2.2.6b
@@ -29,6 +29,7 @@ COMMON_DEPEND="media-libs/libvorbis
 	tdb? ( sys-libs/tdb )
 "
 RDEPEND="${COMMON_DEPEND}
+	gnome? ( gnome-base/gsettings-desktop-schemas )
 	sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/pkgconfig-0.17"
@@ -38,6 +39,9 @@ REQUIRED_USE="udev? ( alsa )"
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-underlinking.patch
 
+	# https://bugs.freedesktop.org/show_bug.cgi?id=35024
+	epatch "${FILESDIR}/${PN}-0.28-workaround-hang.patch"
+
 	# gconf-2.m4 is needed for autoconf, bug #374561
 	if ! use gtk && ! use gtk3 ; then
 		cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!"
@@ -67,14 +71,15 @@ src_configure() {
 
 src_install() {
 	# Disable parallel installation until bug #253862 is solved
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install
 
-	# Remove useless .la files
-	# la files in /usr/lib*/${P}/ are needed
-	if use gtk || use gtk3; then
-		rm -v "${ED}"/usr/$(get_libdir)/gtk-*/modules/*.la || die
-	fi
-	rm -v "${ED}"/usr/$(get_libdir)/*.la || die
+	# Remove useless .la files:
+	# libcanberra uses lt_dlopenext instead of ld_dlopen to load the modules,
+	# which means that it will first try appending ".la" to the given filename
+	# prefix; if that fails, it will append the module extension for the
+	# current system and try that (".so" on Linux, ".bundle" on Darwin, ".dll"
+	# on Windows, etc.).  Only if both fail will it return an error.
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
 }
 
 pkg_preinst() { gnome2_gconf_savelist; }