Avoid underlinking the modules, fixes bug #367355.

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

3 files changed, 55 insertions, 5 deletions

diff --git a/media-libs/libcanberra/ChangeLog b/media-libs/libcanberra/ChangeLog
index 8c2d50f74daa..1d4b924738bd 100644
--- a/media-libs/libcanberra/ChangeLog
+++ b/media-libs/libcanberra/ChangeLog
@@ -1,6 +1,10 @@
 # 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.68 2011/05/08 13:52:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/ChangeLog,v 1.69 2011/06/01 01:31:21 flameeyes Exp $
+
+  01 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  libcanberra-0.28-r2.ebuild, +files/libcanberra-0.28-underlinking.patch:
+  Avoid underlinking the modules, fixes bug #367355.
 
 *libcanberra-0.28-r2 (08 May 2011)
 
diff --git a/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch b/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch
new file mode 100644
index 000000000000..aa4843933932
--- /dev/null
+++ b/media-libs/libcanberra/files/libcanberra-0.28-underlinking.patch
@@ -0,0 +1,44 @@
+From 14504663805b9cdc5e514cacdadb7c137a06d6e1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Sun, 15 May 2011 15:02:34 +0200
+Subject: [PATCH] build-sys: link gtk and gtk3 modules to libX11 as well as
+ Gtk itself.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Both of the modules use the XFree/XGetWindowProperty functions which are
+exposed by libX11; without this change, the modules would be
+underlinked, which causes some link editors to refuse the link (including
+GNU gold).
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
+---
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 98102cc..2aaa51f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -383,7 +383,7 @@ AC_ARG_ENABLE([gtk],
+ 
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+ if test "x${gtk}" != xno ; then
+-    PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 ],
++    PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 x11 ],
+         [
+             HAVE_GTK=1
+             AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
+@@ -422,7 +422,7 @@ AC_ARG_ENABLE([gtk3],
+         [gtk3=auto])
+ 
+ if test "x${gtk3}" != xno ; then
+-    PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 ],
++    PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 x11 ],
+         [
+             HAVE_GTK3=1
+             AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])
+-- 
+1.7.5.rc3
+
diff --git a/media-libs/libcanberra/libcanberra-0.28-r2.ebuild b/media-libs/libcanberra/libcanberra-0.28-r2.ebuild
index e80a3173a436..d769c4fbb9c8 100644
--- a/media-libs/libcanberra/libcanberra-0.28-r2.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.28-r2.ebuild
@@ -1,10 +1,10 @@
 # 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-r2.ebuild,v 1.1 2011/05/08 13:52:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.28-r2.ebuild,v 1.2 2011/06/01 01:31:21 flameeyes Exp $
 
 EAPI="4"
 
-inherit gnome2-utils libtool systemd
+inherit gnome2-utils libtool systemd autotools eutils
 
 DESCRIPTION="Portable Sound Event Library"
 HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
@@ -36,8 +36,10 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="udev? ( alsa )"
 
 src_prepare() {
-	# Run elibtoolize for ~x86-fbsd.
-	use x86-fbsd && elibtoolize
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+
+	eautoreconf
+	elibtoolize
 }
 
 src_configure() {