Fix bug 371907 by creating m4, and passing the appropriate AT_M4DIR

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

3 files changed, 23 insertions, 18 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index d8444e38f259..961a980b58f1 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.513 2011/06/16 07:44:52 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.514 2011/06/16 11:07:26 nirbheek Exp $
+
+  16 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gtk+-2.24.5.ebuild:
+  Fix bug 371907 by creating m4, and passing the appropriate AT_M4DIR
 
 *gtk+-2.24.5 (16 Jun 2011)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 879874204d3d..84c82243c67a 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -23,25 +23,25 @@ DIST gtk+-3.0.11.tar.xz 12673196 RMD160 e7ed69ac6f0876917263dabbae2c8f9fb83325c9
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
 EBUILD gtk+-2.22.1-r1.ebuild 7597 RMD160 03ba03c4ff419e7898fa2d547421727162e76658 SHA1 f5c24e1cd89a41f13ecee6f143859f9f94a5f8e9 SHA256 4224d89c2380fdc57bb15d6af05f6d442cedc21ba99dfc9a3048c33b3b45001a
 EBUILD gtk+-2.24.4.ebuild 7317 RMD160 50699385a6211efffabaeceef0334688f02fda0c SHA1 af47c6551767d8edc73fd3300683cd14995233c0 SHA256 9a3f363f8ef61d4697ca585619994571fc6abac720925bd9c952e69c767f1087
-EBUILD gtk+-2.24.5.ebuild 7346 RMD160 be52ba12ae76e2808e4d79fc83b264d10606b922 SHA1 c260c09b88d04afc481bc4ab0fc4f884ccd7fb90 SHA256 ccd87418a5ccd649b3e43672c343cd119cb690bf6e6eb71dfd8155c2e364d5a6
+EBUILD gtk+-2.24.5.ebuild 7433 RMD160 adb81647864888a84ad6b9ff34051e0127998452 SHA1 360e835ccac4657c001a26e6ca5aa2508da412c7 SHA256 7263761d04440886064a322ae9ab998cfa00a231a4b7f0eecbb40567374becad
 EBUILD gtk+-3.0.10.ebuild 5799 RMD160 593efc5363f470144c83d14803c02c95b5009d56 SHA1 cdcaa3dc8618583958d4172b23a9a49e4f437b4c SHA256 02fe8d1fc8bf2d9611d711725878cf99c690101baad6cc70277a2c0c82d33029
 EBUILD gtk+-3.0.11.ebuild 5825 RMD160 d3bf9a4a28e3e6844f9fb9be3e3fbd006badf134 SHA1 f771faf35e81e98ac83f7ee5f4fad202bd17bc19 SHA256 511a22b7d0bf4619d63a0060346068015ee7521b9b61844207347764397e4c95
-MISC ChangeLog 76697 RMD160 4d185dda228db1fa06e1519afbf5250b830b5986 SHA1 991b5d0074ef6d1f1530bcf1aa53eee533d4b3bc SHA256 359f929dc7393ab3866735f8e6142906af8c232278714053c8ec37f24db50716
+MISC ChangeLog 76842 RMD160 eda2aaa4a70487a0d147edef9ccdec4b729ba975 SHA1 46ab8c72f94770e9b48c79c025e5aa8140375578 SHA256 a8cabb3e8626a40873982e78f806fc0f3ff231cdcc6b640d9ac52b0690adf054
 MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN+bR5AAoJEO/kOhxWD91kfaQP/0hwD8Yin7/Ut8WWbgmZO6/I
-UUOE0MJHup7HsFkSk7jmufrW95J0kYtsgJzTexCAdKPyBrrzXcTwF5tYlC98grmZ
-xaOMepYEl4DHDkgzbKJE7C+NCVknLvneIkXdegUgW0+jBvH3K7t+1OHtAIpFnjYG
-XDYa67FsVPejXcUNMn0p//3w3S4thpPvi9k7rkdQNGzrTlJhTqzGSkkMyiCS2Ew4
-FTPD5YlW5pQ+Kex4gllfTu+ieLKI1paRNLrPBnx8Kz2UOlKtRtBBu/MxvOplqlQP
-zdQpBnnwKVgoXaFcO7bIGqfG10XXYT1gP3AM6xeNp9g5CsgnoPKXbfPp9q3glzHJ
-C1rftGfFtPYqSm/KKgBC5Jh91YEUoO3SKYrM74tv65C2PIPRphBpje8msCr99EGG
-BjHr38iyYp6JNwulM+Q0MoewXCGjtVcPWy1IBCJN+eYddNPzHXBfcoXC6NBPZHyG
-FAajpnHSzlfu1skwKOqKQPMl/pSHMa1deMClswl08HUUI5CWnFtu4epxtcb4opv0
-VouI2lDw8IOCyvTDBeF6OCBNRix3Ro1fXoIYGuzKX5TSm5cHBC8YkIVIVQ5XVtpy
-ElulZLmQFaOCYXjAAOyqvJ/mf8TP4qU7Gr+NKI4NH1E9YejyCnINGkLMnI7EfCxl
-JhiRz4eLbokkIZwi+a8u
-=P0TD
+iQIcBAEBAgAGBQJN+eP0AAoJEO/kOhxWD91kr6UQAKqoCN7881RlRXGgbMEZOV7H
+RicNU33y1kzDzlcUbNHjjU661zRmaMAIIITk4Ev7AacTdKZ1mIjkgyCq/s0bLSVy
+x4kupCFbe/BE1GCvsHR95ILOhfqOGtXosLkxaNlJOqAMzCO2/5eNNnDlbpyfqvkM
+gnUztRuA7pHD27lRSqb0hpSKu/rysmr5iz8cB0ZDkzWn0a4xV1q4k9KPtvENwM/i
+4TbBsPcRu0/W6Lw0PKtXx9BPC+8fa2vkixnQhm7uoR/kLXFnHm0hHDeRuOhDXuRB
+VjhHigXS2s4OHytnMv+gnmXbF//IKjPPpGw2qB+MvbwQ01VGyB7HrRa8Fpg6g2ps
+IExMnALMizwMrB6rpUGUmoAl6DfANbFo7D/46C6R58b89WPbq9NX6xHhUc2NlwmD
+vJmXIcc3M6VEZOVzuhjcBrg6AFj0SFSjbRCCpHaC+opFDqXyS4tjr/rG80VUqkT1
+0r9yfgNumF2wq85f7Hvjx+VHsnqdDx7U8Vno7sNUBr4yas2d/FGjZQYSVluZ4i8R
+KujWKKW+57iMoagbVD8d1Jj89bAAQzTZdJzv+Q/AI8Qm3v/4hOk8AuLClWFHx0HB
+gSMi5tGpas1uXNWkFKtCDkhShnU4a3pjLxSUkBJdSpc0ORKaQ7XnJdYfKwXd7boi
+KECSoqVt4zyi7/jjAj++
+=ZArY
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.5.ebuild b/x11-libs/gtk+/gtk+-2.24.5.ebuild
index f4302ae9b74f..cb229ff976ff 100644
--- a/x11-libs/gtk+/gtk+-2.24.5.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.5.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/gtk+/gtk+-2.24.5.ebuild,v 1.1 2011/06/16 07:44:52 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.5.ebuild,v 1.2 2011/06/16 11:07:26 nirbheek Exp $
 
 EAPI="3"
 GNOME2_LA_PUNT="yes"
@@ -131,9 +131,11 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
 	fi
 
+	# http://bugs.gentoo.org/show_bug.cgi?id=371907
+	mkdir -p "${S}/m4"
+	AT_M4DIR=m4macros eautoreconf
 	# Use elibtoolize in place of eautoreconf when it will be dropped
 	#elibtoolize
-	eautoreconf
 }
 
 src_configure() {