Fix 3.6.1-r2 to autoreconf with automake-1.11.x, bug #403779

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

4 files changed, 42 insertions, 8 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index a76a389d7e95..a063ade222a0 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.135 2012/02/14 01:19:47 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.136 2012/02/17 01:36:13 blueness Exp $
+
+  17 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  valgrind-3.6.1-r2.ebuild, +files/valgrind-3.6.1-automake-1.11.3.patch:
+  Fix 3.6.1-r2 to autoreconf with automake-1.11.x, bug #403779
 
 *valgrind-3.7.0-r3 (14 Feb 2012)
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 0e496bdc0e3f..2e9fcbc0574b 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -19,6 +19,7 @@ AUX valgrind-3.6.0-glibc-2.13.patch 1761 RMD160 744d6a884896d8aaf8f06808a2a75f0b
 AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
 AUX valgrind-3.6.0-non-exec-stack.patch 5613 RMD160 641cd94fd5254ea902bd66eb0437e9af0e21fdb4 SHA1 eeb788f208303ef8768d4713c2c01bfd3f2edec4 SHA256 9a5a92506a10af32eba7a28401f061d4a84eac26a4dbb94fc6a19471c4bdb257
 AUX valgrind-3.6.0-strcasecmp.patch 3786 RMD160 7887dd9e2dc9e5934a25106c6413458bbe5203e3 SHA1 4eec14e0c7beb671050d4c91986cc878cdb5494f SHA256 e281b93d1f2e0166fbba6ebd061a8fd7a01edd31b56cf23f1f84617385add0f6
+AUX valgrind-3.6.1-automake-1.11.3.patch 957 RMD160 2cc22c5bdba5bbc8e02759a759c884412ad3c051 SHA1 cea0842b11b8b656e225e9af532411fad4aa4e87 SHA256 73eb19684637b53efdf01e02304e02a7a38ef7aa8d92acd02b7df5aa581d77d1
 AUX valgrind-3.6.1-glibc-2.14.patch 1078 RMD160 d0a853f9d65e821e3586fd3058db37bb2139e251 SHA1 98b0ea183b90ddf5aee4f68f31f6bf5e818ba4ac SHA256 c76f3f965ebd98d469e6431780267dfb7ad1a58da0ab397ebfc21a08e98828a5
 AUX valgrind-3.6.1-linux-3.patch 392 RMD160 1b654f96b339c15e1e89d41d8dfa01fc5be3cd60 SHA1 c191a54cf24952e103ee1a882fce4c50c119c81d SHA256 056b6fc872ed0be91a2000e599a9431e1bc78efa7ee2ac986f74f2e450f28582
 AUX valgrind-3.6.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217
@@ -44,17 +45,17 @@ EBUILD valgrind-3.5.0-r1.ebuild 3730 RMD160 b485ad3121c741099c5fb3711f52194ebdf4
 EBUILD valgrind-3.5.0.ebuild 3648 RMD160 d3569e0802939fd698787e234db83f17847e2b03 SHA1 af5bbe18d9ca1cb6be77c495de1fb5429c81aa17 SHA256 9092956486a250b85479e3723138848e6192239e79aca06637dfa0811f21487d
 EBUILD valgrind-3.6.0.ebuild 3040 RMD160 ed2e6ba1c77077c4c171c5b0fb651779c97ca8b2 SHA1 8a8560a12cd63456a2070d86a5375612b19a2ab7 SHA256 bf92aa0977ea7d3978dae720e85fa7643b89d4ebd7c39ade3a36c4d20ba47fea
 EBUILD valgrind-3.6.1-r1.ebuild 3176 RMD160 f415387b3262de66da0a856f3ae941c7549429dd SHA1 42a8edd2c6d02c67ebb810f627ad452857655704 SHA256 84425249bcbe89d2df2b5ee1d43556a74441bb3e5b1d9bdc5ed9a529cee846a1
-EBUILD valgrind-3.6.1-r2.ebuild 3274 RMD160 73bb4329831338e42ed89da3bce708734200e37e SHA1 2e88d94fe6bb219147e560d9a7110eac168e0fbd SHA256 76c3a09da89fee55a1d2fc4de723013183ffa6dca020eb91bc508e7348cb9858
+EBUILD valgrind-3.6.1-r2.ebuild 3394 RMD160 ca9e32ef8ac68551265bb392d42345050fbaa185 SHA1 3d9d8e20b69809690260d843e7577a36fc0c362a SHA256 1e58ec3f03d19661036307d2e4404380bf0e96baa5c3bd2dbd99ab743d958a82
 EBUILD valgrind-3.6.1.ebuild 3068 RMD160 5ae01b6484705ad9c7e7bf7e888a355054e6e4c2 SHA1 bcf3c5107a61fbfabbee441d3a304a9ffad8f672 SHA256 93eea5c2c81b7b92ba250706bec21d21575a88c5d426b37096409772119f4e0f
 EBUILD valgrind-3.7.0-r1.ebuild 2720 RMD160 4d4a707fac4c62a68d3de02ac44e23b8f641a4e1 SHA1 6283fed760b8fcd3391639e0cc8d92d398b110f6 SHA256 93b9f2dc0f5b24f17b4ae070740641b03de1d02b38f9a1bc808e660d31deea94
 EBUILD valgrind-3.7.0-r2.ebuild 2914 RMD160 2fa503bf96bde0acb40127f7e2dba33a8def975c SHA1 7ce04c6b5eb8005a0f07ec5724b38cbfb0796a9c SHA256 a5b9a5af3dabe5c16f63a29861a518a1d76bea403072ec5dae3d539f2ecd338d
 EBUILD valgrind-3.7.0-r3.ebuild 2953 RMD160 ecc6aad147d1d45ce2448978972bad491a0f2235 SHA1 444759afbfe632bd13bf256e0a51ca63635e708b SHA256 315d940ccc86dbbe845a03c6415863cc7e1813814a90a7f64dafccf9bec54bd8
-MISC ChangeLog 22648 RMD160 e7956d3ce5ab79e88e2815990215512fc95df78b SHA1 7717275426543ad66d61d0c86dd3a72221687fa2 SHA256 fb746ebd986bdd91f178a7c172d631a6518342fe12c392e6a062daa762dd3e1c
+MISC ChangeLog 22840 RMD160 c03624299a1b5f7adfa3f68671c238d339c1aceb SHA1 648da9ee50b821f91c62508ca9d0b975baab964a SHA256 cf98c23d17608774f62e2eea2375cfca42ac4229e9462af463c7de09bdaf1179
 MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk85tr4ACgkQl5yvQNBFVTVvJwCggD4i+VAskocGup4unJ9JwEr0
-cZwAn1NM6CRRd5rvimwhLfD+sUVtbguO
-=tfNP
+iEYEAREIAAYFAk89rxcACgkQl5yvQNBFVTXGBQCfaVLk+tt7tyLdiMfzo4riGnIP
+YbUAn1sBLCGPtcq2/GZvbRtgDRofeJz/
+=poao
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-automake-1.11.3.patch b/dev-util/valgrind/files/valgrind-3.6.1-automake-1.11.3.patch
new file mode 100644
index 000000000000..4c1eda338505
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.1-automake-1.11.3.patch
@@ -0,0 +1,26 @@
+Backport of valgrind-3.7.0-automake-1.11.2.patch
+
+Retain the old behavior of the build system even with automake 1.11.3.
+
+Reported-by: Oleg Bulatov <dmage@bk.ru>
+X-Gentoo-Bug: 397429
+X-Gentoo-Bug: 403779
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397429
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=403779
+X-KDE-Bug: 290719
+X-KDE-Bug-URL: https://bugs.kde.org/show_bug.cgi?id=290719
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+diff -Naur valgrind-3.6.1.orig//Makefile.am valgrind-3.6.1/Makefile.am
+--- valgrind-3.6.1.orig//Makefile.am	2010-10-20 16:19:45.000000000 -0400
++++ valgrind-3.6.1/Makefile.am	2012-02-16 20:27:23.000000000 -0500
+@@ -57,7 +57,8 @@
+ # default.supp, as it is built from the base .supp files at compile-time.
+ dist_noinst_DATA = $(SUPP_FILES)
+ 
+-pkglib_DATA = default.supp
++vgdatadir = $(pkglibdir)
++vgdata_DATA = default.supp
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = valgrind.pc
diff --git a/dev-util/valgrind/valgrind-3.6.1-r2.ebuild b/dev-util/valgrind/valgrind-3.6.1-r2.ebuild
index b67b98aab141..ff800a39939b 100644
--- a/dev-util/valgrind/valgrind-3.6.1-r2.ebuild
+++ b/dev-util/valgrind/valgrind-3.6.1-r2.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/dev-util/valgrind/valgrind-3.6.1-r2.ebuild,v 1.3 2011/10/28 00:35:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1-r2.ebuild,v 1.4 2012/02/17 01:36:13 blueness Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
@@ -50,6 +50,9 @@ src_prepare() {
 	# Allow valgrind to build against glibc-2.14, bug #378157
 	epatch "${FILESDIR}"/${PN}-3.6.1-glibc-2.14.patch
 
+	# Fix stricter use of dir variables, bugs #397429 and #403779
+	epatch "${FILESDIR}"/${PN}-3.6.1-automake-1.11.3.patch
+
 	# Regenerate autotools files
 	eautoreconf
 }