Do not build test programs that are not really used, and cause underlinking failures (bug #367397).

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

3 files changed, 38 insertions, 3 deletions

diff --git a/x11-libs/libgksu/ChangeLog b/x11-libs/libgksu/ChangeLog
index 05521b103ebe..14f65bf67aea 100644
--- a/x11-libs/libgksu/ChangeLog
+++ b/x11-libs/libgksu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libgksu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libgksu/ChangeLog,v 1.79 2011/04/10 17:03:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libgksu/ChangeLog,v 1.80 2011/06/03 14:28:39 flameeyes Exp $
+
+  03 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  libgksu-2.0.12-r1.ebuild, +files/libgksu-2.0.12-notests.patch:
+  Do not build test programs that are not really used, and cause underlinking
+  failures (bug #367397).
 
   10 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> libgksu-2.0.12-r1.ebuild:
   Remove useless libtool archive wrt #362889 by Cesko Voeten.
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch b/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch
new file mode 100644
index 000000000000..3787ef6bfc13
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch
@@ -0,0 +1,26 @@
+Index: libgksu-2.0.12/libgksu/Makefile.am
+===================================================================
+--- libgksu-2.0.12.orig/libgksu/Makefile.am
++++ libgksu-2.0.12/libgksu/Makefile.am
+@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper
+ gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+ 
+-noinst_PROGRAMS = test-gksu
++EXTRA_PROGRAMS = test-gksu
+ test_gksu_SOURCES = test-gksu.c
+ test_gksu_LDADD = libgksu2.la
+ test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
+Index: libgksu-2.0.12/libgksuui/Makefile.am
+===================================================================
+--- libgksu-2.0.12.orig/libgksuui/Makefile.am
++++ libgksu-2.0.12/libgksuui/Makefile.am
+@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
+ noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
+ includedir = ${prefix}/include/$(PACKAGE)
+ 
+-noinst_PROGRAMS = test-gksuui
++EXTRA_PROGRAMS = test-gksuui
+ test_gksuui_SOURCES = test-gksuui.c
+ test_gksuui_LDADD = libgksuui1.0.la
+ test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r1.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r1.ebuild
index 5bcba673bda5..4fc73ee28c21 100644
--- a/x11-libs/libgksu/libgksu-2.0.12-r1.ebuild
+++ b/x11-libs/libgksu/libgksu-2.0.12-r1.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/x11-libs/libgksu/libgksu-2.0.12-r1.ebuild,v 1.10 2011/04/10 17:03:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libgksu/libgksu-2.0.12-r1.ebuild,v 1.11 2011/06/03 14:28:39 flameeyes Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -55,7 +55,11 @@ src_prepare() {
 	# Make this gmake-3.82 compliant, bug #333961
 	epatch "${FILESDIR}/${P}-fix-make-3.82.patch"
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
+	# Do not build test programs that are never executed; also fixes bug
+	# #367397 (underlinking issues).
+	epatch "${FILESDIR}/${P}-notests.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }