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

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 45 insertions, 9 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/Manifest b/x11-libs/libgksu/Manifest
index 6d257f2dc5f1..1e897f86a580 100644
--- a/x11-libs/libgksu/Manifest
+++ b/x11-libs/libgksu/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX libgksu-2.0.0-fbsd.patch 2847 RMD160 feeb1fa7ffa1d6d32fedeaffa485635fdee90833 SHA1 d32f24f03a728903de2f3b0a449d7787561fa622 SHA256 bf0343df8e316ac227da7c40a889dd5128da081a640c187dfb743b4f213c3792
 AUX libgksu-2.0.12-fix-make-3.82.patch 639 RMD160 c8528a2f42097b07e444bd9efc49971f6f435989 SHA1 82e4b3db63d80211c7caaba3456542f449ed9707 SHA256 4634482b8b9187fd6eaa8560fc88a3f0f93f3a7a143b5b42cdc9ffa2ac112d11
+AUX libgksu-2.0.12-notests.patch 1060 RMD160 7d3944d0c027ab7ec8fb40cfe4b11359659bade1 SHA1 ea24e5c3edf0caac9363a9dfb9e0e00af0653d44 SHA256 6cac450d0e3d8950c25fec078cc41478138fd14afe3492e96f7b889178725707
 AUX libgksu-2.0.12-revert-forkpty.patch 11018 RMD160 4d2b8243b40859c074909db1df19eae8efbc9fe0 SHA1 cfdf41006e2ba5054aec17f85bdcf3777e62c16f SHA256 e75597115bdc7c30ee223d73f5c071d7cceffd04fbf2798d1aa17920fae865dd
 AUX libgksu-2.0.7-libs.patch 3129 RMD160 4a0056954c6039a118c56c236c0c74072b062b9d SHA1 8cb3c4f814c5799b828a202c4200673344ed0df8 SHA256 62d1d576bd8e4b07494a788d6760463ee2090e341dae5113d5f763a3549f6b6a
 AUX libgksu-2.0.7-polinguas.patch 736 RMD160 767398d540f476147086315ad998291556975790 SHA1 c1281e894e42646f2b337a222137275cc4b4b487 SHA256 f360bbd003492e7bc7818f97988ff3af81a14c4278b1f788b0b919f743d7ee8f
 DIST libgksu-2.0.12.tar.gz 477903 RMD160 c6d4019d9eda3c53743c80300ba8b843c134ca82 SHA1 81a541ccfe9ea278dd3e2a80b3287f02f6eb88f8 SHA256 22f9cfc3627dcb6774b9aff66c6ea6554f3b34b82bbfa2467b821e67874c3faf
-EBUILD libgksu-2.0.12-r1.ebuild 1640 RMD160 afd6b0bc78ffdd52bd79eab4452f8b18903be9da SHA1 6c75c208e83ffd4a650985a3d1b10da80ebe7752 SHA256 469328b3fcdb5d7d32570b67fcbe79f887bb6b87a815730f9db939743cd4ce57
-MISC ChangeLog 10871 RMD160 1ec5405d5fae270845e3f6cfcc36c37982d235a6 SHA1 1f3c16a7ded28d4cf9af441b43355db80ca352f3 SHA256 b28e811c49ec44fe8fc4346191445facec0091cda7ba182ec2b3408f6b6c0107
+EBUILD libgksu-2.0.12-r1.ebuild 1785 RMD160 6ec5f04d4e56ba8389c129882f9d7e712aca929d SHA1 5ce6fea9ac4f81c8873f6e63f21f3ae9024e9ec6 SHA256 55c8a772b4b8e8ff6b42b05b1bbaf78ffb3da9ee9f93755d59a2977748186053
+MISC ChangeLog 11097 RMD160 7881dab98ca8b79670c86367e30781763f9d06eb SHA1 db735a9ec078ab826430960b7230270395ff60aa SHA256 6a400190005abeaa01e5ba1142a79cde54b95eadded2c965e41b1c72f8302222
 MISC metadata.xml 253 RMD160 e1dda0cee52f7759dd137d288dacc865dd211027 SHA1 f04021419226bd57c9c960fbcf798d9c249d22d8 SHA256 39d57d5a8be47e8247d2b8659b092c4421f2eef9cc83e541755a9eb34dcb667c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2h4wAACgkQXkR9YqOcLPEHAAD/VQMyPk2ZI3jzViX7cU2v2L6V
-musgkFZV2fE/jnnXS9YBAJIPckMTpp2gKuBHK2FQy7s783meHC8y19/FnZLWrACY
-=jjDZ
+iEYEARECAAYFAk3o76EACgkQAiZjviIA2XhLxQCgyt82suFrY3hENsRPeeVGwRpj
+19IAoJCJF5I0ynzQeqPtu6VVlOly8FIG
+=GqDh
 -----END PGP SIGNATURE-----
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
 }