Fix working with autoconf-2.60 #142264.

Package-Manager: portage-2.1.1_pre4

4 files changed, 60 insertions, 17 deletions

diff --git a/dev-libs/elfutils/ChangeLog b/dev-libs/elfutils/ChangeLog
index c1a04f73591b..f9dfdf081591 100644
--- a/dev-libs/elfutils/ChangeLog
+++ b/dev-libs/elfutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/elfutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.82 2006/07/25 14:32:35 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.83 2006/08/04 15:34:11 vapier Exp $
+
+  04 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/elfutils-0.122-aux-config-dir.patch, elfutils-0.122.ebuild:
+  Fix working with autoconf-2.60 #142264.
 
 *elfutils-0.122 (25 Jul 2006)
 
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 59555537df35..2600814700fb 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -33,9 +33,13 @@ AUX elfutils-0.120-mkinstalldirs.patch 752 RMD160 523cceb5a3d394ebba88cb5bdb6e0b
 MD5 2661049bdc5eb0263a4cc835ed505cd9 files/elfutils-0.120-mkinstalldirs.patch 752
 RMD160 523cceb5a3d394ebba88cb5bdb6e0b41daf9e6da files/elfutils-0.120-mkinstalldirs.patch 752
 SHA256 73cd540e3a473b145d0efa227d8744fcef531834f2b730dd1cfc191b86872ffb files/elfutils-0.120-mkinstalldirs.patch 752
-DIST elfutils-0.108-robustify3.patch.bz2 10811 RMD160 31660eba01bf6469db01bb704ca7e90b56e69286 SHA256 acdd745bbc82937b5252775b9ae951fa3fc8e98f1d8b5524ddbf30f5bd16ebee
+AUX elfutils-0.122-aux-config-dir.patch 1070 RMD160 b4e378e912bc9ab04938133d467b0899b9a13df7 SHA1 89ef05f9a21e5192f1ff37da4435a782fec9c0c3 SHA256 dea547cf5c2d3d6da10b2a68c9fa4e8bb5e3f1a1112a946b1e796c25790447d9
+MD5 84d5c25eb87df611293730d816b5e882 files/elfutils-0.122-aux-config-dir.patch 1070
+RMD160 b4e378e912bc9ab04938133d467b0899b9a13df7 files/elfutils-0.122-aux-config-dir.patch 1070
+SHA256 dea547cf5c2d3d6da10b2a68c9fa4e8bb5e3f1a1112a946b1e796c25790447d9 files/elfutils-0.122-aux-config-dir.patch 1070
+DIST elfutils-0.108-robustify3.patch.bz2 10811 RMD160 31660eba01bf6469db01bb704ca7e90b56e69286 SHA1 b9110fc90a47a65150c63d661aeeebe3e581ffd6 SHA256 acdd745bbc82937b5252775b9ae951fa3fc8e98f1d8b5524ddbf30f5bd16ebee
 DIST elfutils-0.108.robustify.patch.bz2 5637 RMD160 f5f24712649b2d85e695e24ca38d7871745be6c8 SHA256 7ca7ffcb5368bfa03dc3da2a70153d9a13c6b6cc675bcd05edd589d13f94a84c
-DIST elfutils-0.108.tar.gz 938036 RMD160 ac7a1314fd9d18413670ce46d0558e8399d1b32e SHA256 794070c8108a2d8b7c6890ba42edb37510cc845bf601517cf4a0ea5443dfde29
+DIST elfutils-0.108.tar.gz 938036 RMD160 ac7a1314fd9d18413670ce46d0558e8399d1b32e SHA1 6d161774605083759e8764a649e685d41e2b2b7c SHA256 794070c8108a2d8b7c6890ba42edb37510cc845bf601517cf4a0ea5443dfde29
 DIST elfutils-0.118-patches-1.0.tar.bz2 16369 RMD160 9125f94c0c1c6380100bae6f5d9fb0341001ce2f SHA1 0445a0634521c371c625e454061c5bcce973fe75 SHA256 d61d0849c4e3114d503ec1a3cb477c285f1bddf89178b3011c9948fac14c3bb8
 DIST elfutils-0.118.tar.gz 1083164 RMD160 4952405a42290bffbed9f8ee7f1cfcc7fc3ae8fd SHA1 882029a3fd7cd7d5d1cba4d8d0e238d0e3308ac0 SHA256 e90db35bc93e23b198b60f09fb767ab5bf855921f7fd7e7e00add16772d3fe32
 DIST elfutils-0.120-patches-1.0.tar.bz2 16322 RMD160 979160ef30a7d3d2bfc8bce20143b8663c62e3d0 SHA1 b94164a5a8d264876339e9438ec2b0b49c00244f SHA256 527501e03b1267bd2e9f0283319db120d9f15324bd9f7820d24624a323ddf136
@@ -58,14 +62,14 @@ EBUILD elfutils-0.120.ebuild 1767 RMD160 77414fb3f597a4848c72a1bea7d72dbe9e7f215
 MD5 ca0cef81ab839443d9849bc167b75b89 elfutils-0.120.ebuild 1767
 RMD160 77414fb3f597a4848c72a1bea7d72dbe9e7f2155 elfutils-0.120.ebuild 1767
 SHA256 e8fee4eb361337c948ee079681837fccf761a8884196df85201149a50ed89960 elfutils-0.120.ebuild 1767
-EBUILD elfutils-0.122.ebuild 1767 RMD160 ca5923a9b0b5e479e4c8494116faa10ffa653db3 SHA1 f4ce3fe337e44f974e5d8fc84fd61f3fc71436e9 SHA256 0edf7a4cdb5ab96ae62482a276ebaf71a27a7a8c0054596ef3db5325b08f1267
-MD5 2c177b95de1eb9f1cfb393b007a68786 elfutils-0.122.ebuild 1767
-RMD160 ca5923a9b0b5e479e4c8494116faa10ffa653db3 elfutils-0.122.ebuild 1767
-SHA256 0edf7a4cdb5ab96ae62482a276ebaf71a27a7a8c0054596ef3db5325b08f1267 elfutils-0.122.ebuild 1767
-MISC ChangeLog 11084 RMD160 b0735ff253b71644ee3253e85130b57a0ac57dfe SHA1 2fedf77c640d6a7e2c8aece96515aba1b4ce947b SHA256 24fc8e0562680c2c4adc8992c52b676492046ea50ab3b166a63ba5c3648dcd45
-MD5 7cad3b46a3893c70f91de16b67aec2e7 ChangeLog 11084
-RMD160 b0735ff253b71644ee3253e85130b57a0ac57dfe ChangeLog 11084
-SHA256 24fc8e0562680c2c4adc8992c52b676492046ea50ab3b166a63ba5c3648dcd45 ChangeLog 11084
+EBUILD elfutils-0.122.ebuild 1874 RMD160 e3e35af475106bd58306154f2be88677c61b54a6 SHA1 ec0dc5c472e7401713ced474ec521f98ecc64485 SHA256 8f73e73b7de2da6acd3e528fe0ac04310587411bcf960addf83aac5cdcdc5d00
+MD5 3bccc2e4b2f5eb6411c5e7ae68033796 elfutils-0.122.ebuild 1874
+RMD160 e3e35af475106bd58306154f2be88677c61b54a6 elfutils-0.122.ebuild 1874
+SHA256 8f73e73b7de2da6acd3e528fe0ac04310587411bcf960addf83aac5cdcdc5d00 elfutils-0.122.ebuild 1874
+MISC ChangeLog 11246 RMD160 eea66d79a01c912e603108f55adcd60fec399b2f SHA1 ef4be9c840d3f2270b8d645f25b57847911d0e07 SHA256 6fe3a2ecffa400b323f480a1ba961f9d12126f2adadecee6eaa16b28fb859682
+MD5 8e9d55b433191adf191dfbf6b9a6f0a2 ChangeLog 11246
+RMD160 eea66d79a01c912e603108f55adcd60fec399b2f ChangeLog 11246
+SHA256 6fe3a2ecffa400b323f480a1ba961f9d12126f2adadecee6eaa16b28fb859682 ChangeLog 11246
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -88,7 +92,7 @@ SHA256 1373a75ec1e6a60794319a8143d0aabf8ec013149311b5665bd5bc024e4c3a4c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFExiwx1ZcsMnZjRyIRAt9pAJ0Y7MAQJd16wW9nSKUF8OfCu5Y0XQCgh7jD
-f+2otvlMMBh8+Qxb6Bqp2i8=
-=3c01
+iD8DBQFE02kBamhnQswr0vIRAtcvAKCxQJGYb352guMD5edtlI1wrvERdwCfYvJI
+aku+i6MK9E7CsqHqjjItERs=
+=5W+w
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/elfutils/elfutils-0.122.ebuild b/dev-libs/elfutils/elfutils-0.122.ebuild
index 6ba31611a224..6a918ff9d257 100644
--- a/dev-libs/elfutils/elfutils-0.122.ebuild
+++ b/dev-libs/elfutils/elfutils-0.122.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.122.ebuild,v 1.1 2006/07/25 14:32:35 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.122.ebuild,v 1.2 2006/08/04 15:34:11 vapier Exp $
 
 inherit eutils autotools
 
@@ -34,9 +34,11 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.118-libelf-link.patch
 	epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch
 	epatch "${FILESDIR}"/${PN}-0.118-no-nested-functions.patch #116968
-	epatch "${FILESDIR}"/${PN}-0.120-mkinstalldirs.patch
+	epatch "${FILESDIR}"/${PN}-0.122-aux-config-dir.patch #
+	# this will make more files than need be, but who cares really
+	chmod a+rx config/*
 
-	eautoreconf
+	AT_M4DIR="${S}/m4" eautoreconf
 
 	find . -name Makefile.in -print0 | xargs -0 sed -i -e 's:-W\(error\|extra\)::g'
 }
diff --git a/dev-libs/elfutils/files/elfutils-0.122-aux-config-dir.patch b/dev-libs/elfutils/files/elfutils-0.122-aux-config-dir.patch
new file mode 100644
index 000000000000..9632674a21ca
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.122-aux-config-dir.patch
@@ -0,0 +1,33 @@
+--- configure.ac
++++ configure.ac
+@@ -19,7 +19,7 @@
+ AC_INIT([Red Hat elfutils],[0.122],[http://bugzilla.redhat.com/bugzilla/],
+ 	[elfutils])
+ 
+-AC_CONFIG_AUX_DIR([config])
++AC_CONFIG_AUX_DIR([$PWD/config])
+ AC_CONFIG_FILES([config/Makefile])
+ 
+ AC_COPYRIGHT([Copyright (C) 1996-2003, 2004, 2005, 2006 Red Hat, Inc.])
+--- libelf-po/Makefile.in.in
++++ libelf-po/Makefile.in.in
+@@ -28,7 +28,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
+--- po/Makefile.in.in
++++ po/Makefile.in.in
+@@ -28,7 +28,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@