Fix building with automake-1.11.2 (bug #397411, thanks to Alphat-PC for the patch).

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

diff --git a/x11-libs/libgksu/ChangeLog b/x11-libs/libgksu/ChangeLog
index 0c681e3759b761f90a0445945360f56ac456d5f1..424fd2502c77e46e6da69542d1c096a13e075a56 100644 (file)
--- 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.82 2011/11/15 23:11:17 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libgksu/ChangeLog,v 1.83 2012/01/05 01:46:22 tetromino Exp $
+
+  05 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libgksu-2.0.12-r1.ebuild, +files/libgksu-2.0.12-automake-1.11.2.patch:
+  Fix building with automake-1.11.2 (bug #397411, thanks to Alphat-PC for the
+  patch).
 
   15 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   libgksu-2.0.12-r1.ebuild:

diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
index f14f0f83ea9297630362bf0d0cf8328936f19504..837f1ee49e92dfcdd3c27e604f04afa27380f310 100644 (file)
--- a/x11-libs/libgksu/Manifest
+++ b/x11-libs/libgksu/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA256
 
 AUX libgksu-2.0.0-fbsd.patch 2847 RMD160 feeb1fa7ffa1d6d32fedeaffa485635fdee90833 SHA1 d32f24f03a728903de2f3b0a449d7787561fa622 SHA256 bf0343df8e316ac227da7c40a889dd5128da081a640c187dfb743b4f213c3792
+AUX libgksu-2.0.12-automake-1.11.2.patch 836 RMD160 142e03969dfc3fe0c2e262de11cdc402ae3412a8 SHA1 0ce8c11f323436521d2f6e714aa6634a92e68059 SHA256 8d6573025758e5f5c569963fab2d99f406ea50fb055bf06693868ba976c5dd66
 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 1779 RMD160 ea1f7f229fcd7f2ba21a7ed98b44ed2d3f701a72 SHA1 6d16dd54236c0aaf503730af28d4bd417f641860 SHA256 4d39caf996e47c9210ef755ca8c1a0388e8cfc758a146218429c1ba9edab1ad0
-MISC ChangeLog 11359 RMD160 91bd1e1fc74623e0c62b601ad7c15f2e8317bd90 SHA1 474e8d74cf8ed472c7866e76b668e6009c449ecd SHA256 1ad56f2584c4b7b0f0391d34c27d411609334821b5a6ddf3172620b3beaf944f
+EBUILD libgksu-2.0.12-r1.ebuild 1879 RMD160 b624a9e69341b2204678703b8ec21fe8db69c988 SHA1 ead1d90b9126ed44aa57d089d6b67e9bbedfa212 SHA256 86750aff64cacb5e71eb8a186f278b7a3f0d338f381dde26cea2862a92a85511
+MISC ChangeLog 11580 RMD160 0ff2b54c386ae13e17e872f205cbe8b29ec1b553 SHA1 d49f049a028bad358b4442352fca5428195f9498 SHA256 23d818eb3d6393d3c4cfddf1856ca58eca2b11b4a78f9ade00fcaaa3e71a7084
 MISC metadata.xml 253 RMD160 e1dda0cee52f7759dd137d288dacc865dd211027 SHA1 f04021419226bd57c9c960fbcf798d9c249d22d8 SHA256 39d57d5a8be47e8247d2b8659b092c4421f2eef9cc83e541755a9eb34dcb667c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7C8ZoACgkQdjK8w9WeBnDnbAEAnWcz6Tmg/W7C9ucNasUbmG2X
-dDYV+jlbIPU76MzecNQA/2xEfytBo+AQozX4ECis30FK8etGbmNmDQhdnLMFd13U
-=yHq2
+iF4EAREIAAYFAk8FAPMACgkQdjK8w9WeBnAmDAD/Xl/GtzLE9WRqqqXu/S4iVHpf
+QH/Ip8ZxNwIoxHXdzYIA/2Z6KQdZtXZJ0qgs+aNLkQGFpl5FyLeRrbmzjgobAKUD
+=KF0Q
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch
new file mode 100644 (file)
index 0000000..0f22166
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch
@@ -0,0 +1,25 @@
+Due to the following change, pkglib_PROGRAMS is invalid:
+    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+
+https://savannah.nongnu.org/bugs/index.php?35241
+https://bugs.gentoo.org/show_bug.cgi?id=397411
+
+---
+ libgksu/Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
+index 49362f9..3cb1090 100644
+--- a/libgksu/Makefile.am
++++ b/libgksu/Makefile.am
+@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE}
+ pkgconfigdir = ${libdir}/pkgconfig
+ pkgconfig_DATA = libgksu2.pc
+ 
+-pkglibdir = ${libdir}/${PACKAGE}
+-pkglib_PROGRAMS = gksu-run-helper
++gksulibdir = ${libdir}/${PACKAGE}
++gksulib_PROGRAMS = gksu-run-helper
+ gksu_run_helper_LDADD = ${GLIB_LIBS} 
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+ 

diff --git a/x11-libs/libgksu/libgksu-2.0.12-r1.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r1.ebuild
index fa1741b3402d72836be690e38f19799da4172a6a..bd06c04263f51edfaada50a15b66d1201e55dcc3 100644 (file)
--- 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
+# Copyright 1999-2012 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.13 2011/11/15 23:11:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libgksu/libgksu-2.0.12-r1.ebuild,v 1.14 2012/01/05 01:46:22 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -57,6 +57,9 @@ src_prepare() {
        # #367397 (underlinking issues).
        epatch "${FILESDIR}/${P}-notests.patch"
 
+       # Fix automake-1.11.2 compatibility, bug #397411
+       epatch "${FILESDIR}/${P}-automake-1.11.2.patch"
+
        intltoolize --force --copy --automake || die "intltoolize failed"
        eautoreconf
        gnome2_src_prepare