Fixup autotool handling #168198.

Package-Manager: portage-2.1.3_rc5

5 files changed, 168 insertions, 14 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index d87eca5dc374..e4728dff2720 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.318 2007/06/14 02:42:37 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.319 2007/06/27 16:52:18 vapier Exp $
+
+  27 Jun 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/gtk+-1.2.10-automake.patch, +files/gtk+-1.2.10-cleanup.patch,
+  gtk+-1.2.10-r12.ebuild:
+  Fixup autotool handling #168198.
 
 *gtk+-2.10.13 (14 Jun 2007)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index fbf202506e82..074665b19931 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -9,6 +9,14 @@ AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0
 MD5 01aa21ac7a54f5647ad71011b05f300f files/gtk+-1.2.10-as-needed.patch 19865
 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e files/gtk+-1.2.10-as-needed.patch 19865
 SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7 files/gtk+-1.2.10-as-needed.patch 19865
+AUX gtk+-1.2.10-automake.patch 3270 RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e SHA1 1ba127d50f7eddc86e07a37c819b9dd233d27926 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2
+MD5 d28d38c9fc6fab34b50134ff66321d4b files/gtk+-1.2.10-automake.patch 3270
+RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e files/gtk+-1.2.10-automake.patch 3270
+SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2 files/gtk+-1.2.10-automake.patch 3270
+AUX gtk+-1.2.10-cleanup.patch 246 RMD160 edc29b9cbf43115f8630c465e1ba91a631e733c7 SHA1 2766b89116c95ec13b7eb740f5ff79de6a48862d SHA256 6db4c8163e3e9032b5195acf230773d9bfd0c383157d65f2d42e4300e2b6a35f
+MD5 f70444496ff1a23a5b1b3801c9ad6f8e files/gtk+-1.2.10-cleanup.patch 246
+RMD160 edc29b9cbf43115f8630c465e1ba91a631e733c7 files/gtk+-1.2.10-cleanup.patch 246
+SHA256 6db4c8163e3e9032b5195acf230773d9bfd0c383157d65f2d42e4300e2b6a35f files/gtk+-1.2.10-cleanup.patch 246
 AUX gtk+-1.2.10-m4.patch 220 RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 SHA1 898e6846de5d4c57ecc2e2503ed56355324fd2ee SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324
 MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
 RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 files/gtk+-1.2.10-m4.patch 220
@@ -62,10 +70,10 @@ DIST gtk+-2.6.1-lib64.patch.bz2 6047 RMD160 0ce3bf05fe59910ea019b4157dd1066367df
 DIST gtk+-2.6.10.tar.bz2 11521380 RMD160 5bb2e4de406e0e6ccf5c66ec48f6ba3e5b0911ff SHA1 9ba627683e0dc4bceb5fb900c1ee687638d95fcd SHA256 d408b606c8dd414dfbf220ccc168a0bc85a419945439796792a5357a96ff02af
 DIST gtk+-2.8.19.tar.bz2 12303676 RMD160 9d74e7a19f2da0361dd731757310abe1f4c08555 SHA1 5108749bdd2f3ab0b500cec879a0f421a548ca35 SHA256 ccdf52c74ed9902dda6e18923d1fd6fc9c9d48821bf79c4e354d181ff074fdf8
 DIST gtk+-2.8.20.tar.bz2 12247295 RMD160 d20254de9e5b37b19f432758fbd78fff4c6baf1e SHA1 8ea2449ff139b8bc457f8b5bcdcad93b02cfba9e SHA256 69a9b6c1e78da7e71416f20fab0c4972503139406e89ce7fbdbac0e213b16b79
-EBUILD gtk+-1.2.10-r12.ebuild 2319 RMD160 c1e42732cfe898710723ad432e224e914892d679 SHA1 1cefd8c86ee38194d364b08fa7a521f1f8134ca0 SHA256 97f42788bb05fa6611b9422027f0eb8635b79b7429cc99aeabd9d5295d213da1
-MD5 45e4f70fc1f7c9ba9b4619ed742d9fe3 gtk+-1.2.10-r12.ebuild 2319
-RMD160 c1e42732cfe898710723ad432e224e914892d679 gtk+-1.2.10-r12.ebuild 2319
-SHA256 97f42788bb05fa6611b9422027f0eb8635b79b7429cc99aeabd9d5295d213da1 gtk+-1.2.10-r12.ebuild 2319
+EBUILD gtk+-1.2.10-r12.ebuild 2442 RMD160 4b84522ebd4ac63c3bcea91714725da5b8c6a0b6 SHA1 a43b6162e2428e96fe0bb946643c0d15153f21b4 SHA256 20c6006d7e89123820b716277c5ac69b251f7cbf72ff36b44bb10c361e7bab70
+MD5 0db991dd0b64548ad21850daade0fa76 gtk+-1.2.10-r12.ebuild 2442
+RMD160 4b84522ebd4ac63c3bcea91714725da5b8c6a0b6 gtk+-1.2.10-r12.ebuild 2442
+SHA256 20c6006d7e89123820b716277c5ac69b251f7cbf72ff36b44bb10c361e7bab70 gtk+-1.2.10-r12.ebuild 2442
 EBUILD gtk+-2.10.11.ebuild 4043 RMD160 1fb971eae7745916dd593b8592ca93ed9946a8ca SHA1 644e75049cfa0de2e40bfe6b729c7649489f0582 SHA256 02efe6a71edb2d0104827be3dc4881600d6ca9fc2d12a8da6302273d2ece5f8e
 MD5 ac18408c618491db766f6d7723631ca6 gtk+-2.10.11.ebuild 4043
 RMD160 1fb971eae7745916dd593b8592ca93ed9946a8ca gtk+-2.10.11.ebuild 4043
@@ -102,10 +110,10 @@ EBUILD gtk+-2.8.20-r1.ebuild 4092 RMD160 63a741c0bbf75fe549277f5cad36d2b21d7afe7
 MD5 cd6eb30366994c8450fa9359d2d4fcd5 gtk+-2.8.20-r1.ebuild 4092
 RMD160 63a741c0bbf75fe549277f5cad36d2b21d7afe71 gtk+-2.8.20-r1.ebuild 4092
 SHA256 10933d9f04fc0124a446e88fd29892fdb9c2c737b0604d74eae3df8bc4d8b4e1 gtk+-2.8.20-r1.ebuild 4092
-MISC ChangeLog 44734 RMD160 b3319d7156c6bc7b920da6ac58771ec42dc6a141 SHA1 c5342b0d5bf57c4e3eee570c0cf59dae6b2dc200 SHA256 ee0a8e7eb67cabd3d46a10598b74042fa700ff996fb1385737dc3b2bacca5e3e
-MD5 2f9f2df4819425be082500626456445f ChangeLog 44734
-RMD160 b3319d7156c6bc7b920da6ac58771ec42dc6a141 ChangeLog 44734
-SHA256 ee0a8e7eb67cabd3d46a10598b74042fa700ff996fb1385737dc3b2bacca5e3e ChangeLog 44734
+MISC ChangeLog 44919 RMD160 9c81942ad672f7c5e7335759131351e5fe246d6b SHA1 6684aa9ae0aee2b653482c4b072b6c46d82d0d59 SHA256 f09f461c70dbcec7689c5f73a8a1520bebc7224be7db04302cb4c15ce238924e
+MD5 687d28201e8a7a0270c67638169c467d ChangeLog 44919
+RMD160 9c81942ad672f7c5e7335759131351e5fe246d6b ChangeLog 44919
+SHA256 f09f461c70dbcec7689c5f73a8a1520bebc7224be7db04302cb4c15ce238924e ChangeLog 44919
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -143,7 +151,7 @@ SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGfvAHp/wUKkr7RBoRAlBpAJ9HxBKoGvzb1EbC10w944JlYJS+zwCfYN5W
-S2m0rOtXxwZIAiIGKuLgOHQ=
-=T0Un
+iD8DBQFGgpXop/wUKkr7RBoRAiaLAKDiNjDOZijy1sy9cyZKJiNX/F0xvACdG5gj
+SAVT4u8fWpCXTEngb3mvTTo=
+=yq48
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch b/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch
new file mode 100644
index 000000000000..e7b4474618bd
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch
@@ -0,0 +1,126 @@
+--- docs/Makefile.am
++++ docs/Makefile.am
+@@ -166,7 +166,7 @@
+ 	  echo $$p; \
+ 	done
+ 
+-EXTRA_DIST += \
++EXTRA_DIST = \
+ 	Changes-1.2.txt			\
+ 	debugging.txt			\
+ 	developers.txt			\
+--- gdk/Makefile.am
++++ gdk/Makefile.am
+@@ -30,7 +30,7 @@
+ # setup source file variables
+ #
+ # GDK header files for public installation (non-generated)
+-gdk_public_h_sources = @STRIP_BEGIN@ \
++gdk_public_h_sources = \
+ 	gdk.h		\
+ 	gdkcursors.h	\
+ 	gdkrgb.h	\
+@@ -38,9 +38,8 @@
+ 	gdkkeysyms.h	\
+ 	gdkprivate.h	\
+ 	gdktypes.h	\
+-	gdkx.h		\
+-@STRIP_END@
+-gdk_c_sources = @STRIP_BEGIN@ \
++	gdkx.h
++gdk_c_sources = \
+ 	gdk.c		\
+ 	gdkcc.c		\
+ 	gdkcolor.c	\
+@@ -71,8 +70,7 @@
+ 	MwmUtil.h       \
+ 	gxid_lib.h	\
+ 	gxid_proto.h	\
+-        gxid_lib.c	\
+-@STRIP_END@
++	gxid_lib.c
+ 
+ #
+ # setup GDK sources and their dependancies
+@@ -79,10 +79,6 @@
+ #
+ libgdkinclude_HEADERS = $(gdk_public_h_sources)
+ libgdk_la_SOURCES = $(gdk_c_sources)
+-MAINTAINERCLEANFILES +=
+-EXTRA_HEADERS +=
+-EXTRA_DIST +=
+-EXTRA_DIST +=
+ 
+ #
+ # rules to generate built sources
+--- gtk/Makefile.am
++++ gtk/Makefile.am
+@@ -41,7 +41,7 @@
+ # setup source file variables
+ #
+ # GTK+ header files for public installation (non-generated)
+-gtk_public_h_sources = @STRIP_BEGIN@ \
++gtk_public_h_sources = \
+ 	gtk.h			\
+ 	gtkaccelgroup.h		\
+ 	gtkaccellabel.h		\
+@@ -150,13 +150,12 @@
+ 	gtkvscrollbar.h		\
+ 	gtkvseparator.h		\
+ 	gtkwidget.h		\
+-	gtkwindow.h		\
+-@STRIP_END@
++	gtkwindow.h
+ # GTK+ header files that don't get installed
+ gtk_private_h_sources = @STRIP_BEGIN@ \
+ @STRIP_END@
+ # GTK+ C sources to build the library from
+-gtk_c_sources = @STRIP_BEGIN@ \
++gtk_c_sources = \
+ 	gtkaccelgroup.c		\
+ 	gtkaccellabel.c		\
+ 	gtkadjustment.c		\
+@@ -264,8 +263,7 @@
+ 	gtkwidget.c		\
+ 	gtkwindow.c		\
+ 	fnmatch.c		\
+-	fnmatch.h		\
+-@STRIP_END@
++	fnmatch.h
+ # we use our own built_sources variable rules to avoid automake's
+ # BUILT_SOURCES oddities
+ # we generate frequently rebuild files piggyback on a stamp file, so sources
+@@ -284,10 +282,9 @@
+ 	gtk.defs		\
+ @STRIP_END@
+ # built sources that get installed with the header files
+-gtk_built_public_sources = @STRIP_BEGIN@ \
++gtk_built_public_sources = \
+ 	gtkmarshal.h		\
+-	gtktypebuiltins.h	\
+-@STRIP_END@
++	gtktypebuiltins.h
+ # non-header sources (headers should be specified in the above variables)
+ # that don't serve as direct make target sources, i.e. they don't have
+ # their own .lo rules and don't get publically installed
+@@ -313,9 +313,8 @@
+ #
+ libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h
+ libgtk_la_SOURCES = $(gtk_c_sources)
+-MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
+-EXTRA_HEADERS +=
+-EXTRA_DIST += $(gtk_private_h_sources)
++MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources)
++EXTRA_DIST = $(gtk_private_h_sources)
+ EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources)
+ 
+ #
+@@ -323,7 +322,7 @@
+ #
+ # setup autogeneration dependancies
+ gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
+-CLEANFILES += $(gen_sources)
++CLEANFILES = $(gen_sources)
+ COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
+ $(OBJECTS): COPYING 	# this is our oldest-source-stamp
+ # initial creation of the real stamp-* files
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch b/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch
new file mode 100644
index 000000000000..7846c17aad0c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch
@@ -0,0 +1,13 @@
+pull in string prototypes
+
+--- gdk/gdkinputcommon.h
++++ gdk/gdkinputcommon.h
+@@ -24,6 +24,8 @@
+  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+  */
+ 
++#include <string.h>
++
+ #if defined(XINPUT_GXI) || defined(XINPUT_XFREE)
+ 
+ /* Forward declarations */
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
index 2c605f255c6c..44a5c280b278 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.12 2007/01/06 05:09:58 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.13 2007/06/27 16:52:18 vapier Exp $
 
 GNOME_TARBALL_SUFFIX="gz"
-WANT_AUTOMAKE=1.4
 inherit gnome.org eutils toolchain-funcs autotools
 
 DESCRIPTION="The GIMP Toolkit"
@@ -36,9 +35,12 @@ src_unpack() {
 	unpack ${P}.tar.gz
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/${P}-automake.patch
+	epatch "${FILESDIR}"/${P}-cleanup.patch
 	epatch "${DISTDIR}"/gtk+-1.2.10-r8-gentoo.diff.bz2
 	epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch
 	epatch "${FILESDIR}"/${P}-as-needed.patch
+	sed -i '/libtool.m4/,/AM_PROG_NM/d' acinclude.m4 #168198
 	eautoreconf
 }