run eautoreconf, but preserve old macros due to the included gtk-doc macros. fixes #132139

(Portage version: 2.1_pre10-r3)

6 files changed, 27 insertions, 3 deletions

diff --git a/dev-libs/atk/ChangeLog b/dev-libs/atk/ChangeLog
index 80bb41a9e9bd..3e3c629a233e 100644
--- a/dev-libs/atk/ChangeLog
+++ b/dev-libs/atk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/atk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/ChangeLog,v 1.97 2006/05/01 17:59:42 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/ChangeLog,v 1.98 2006/05/08 00:18:47 allanonjl Exp $
+
+  08 May 2006; John N. Laliberte <allanonjl@gentoo.org> atk-1.11.4.ebuild:
+  run eautoreconf, but preserve old macros due to the included gtk-doc macros.
+  fixes #132139
 
 *atk-1.11.4 (01 May 2006)
 
diff --git a/dev-libs/atk/atk-1.11.4.ebuild b/dev-libs/atk/atk-1.11.4.ebuild
index eb2ad7190d18..076d9df9aa86 100644
--- a/dev-libs/atk/atk-1.11.4.ebuild
+++ b/dev-libs/atk/atk-1.11.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-1.11.4.ebuild,v 1.1 2006/05/01 17:59:42 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-1.11.4.ebuild,v 1.2 2006/05/08 00:18:47 allanonjl Exp $
 
-inherit gnome2
+inherit gnome2 autotools
 
 DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
 HOMEPAGE="http://developer.gnome.org/projects/gap/"
@@ -19,3 +19,15 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fix mismatch that some people run into while merging, #132139
+	# we copy aclocal to old_macros to include the gtk-doc macros.
+	cp aclocal.m4 old_macros.m4
+	sed -i -e 's:AM_INIT_AUTOMAKE:AM_INIT_AUTOMAKE2:' old_macros.m4
+	sed -i -e 's:AM_AUTOMAKE_VERSION:AM_AUTOMAKE_VERSION2:' old_macros.m4
+	sed -i -e 's:AM_SET_CURRENT_AUTOMAKE_VERSION:AM_SET_CURRENT_AUTOMAKE_VERSION2:' old_macros.m4
+	AT_M4DIR="." eautoreconf
+}
diff --git a/dev-libs/atk/files/digest-atk-1.10.1 b/dev-libs/atk/files/digest-atk-1.10.1
index 13e2b22b691c..446c2f45e4d6 100644
--- a/dev-libs/atk/files/digest-atk-1.10.1
+++ b/dev-libs/atk/files/digest-atk-1.10.1
@@ -1 +1,3 @@
 MD5 29df8fe9016083e7eaf129bdd65d8402 atk-1.10.1.tar.bz2 492436
+RMD160 272dbc974120c6cf7e62bf67dc7507e0a639dc41 atk-1.10.1.tar.bz2 492436
+SHA256 bd59e74b6f4609cfe8399317b616df466626b6b7ca786e3d600a15fe5f4d08dd atk-1.10.1.tar.bz2 492436
diff --git a/dev-libs/atk/files/digest-atk-1.10.3 b/dev-libs/atk/files/digest-atk-1.10.3
index 5c25441073b7..df9e0820df26 100644
--- a/dev-libs/atk/files/digest-atk-1.10.3
+++ b/dev-libs/atk/files/digest-atk-1.10.3
@@ -1 +1,3 @@
 MD5 c84a01fea567b365c0d44b227fead948 atk-1.10.3.tar.bz2 542712
+RMD160 dcab6927ca3063223b6d4575fa7a1337baf9000f atk-1.10.3.tar.bz2 542712
+SHA256 c596baf95f6a6cd7748b1018336b2ac45ca2ef668816e6c703b01691e09b8a89 atk-1.10.3.tar.bz2 542712
diff --git a/dev-libs/atk/files/digest-atk-1.6.1 b/dev-libs/atk/files/digest-atk-1.6.1
index ef81248228b8..1ed8d1d93c74 100644
--- a/dev-libs/atk/files/digest-atk-1.6.1
+++ b/dev-libs/atk/files/digest-atk-1.6.1
@@ -1 +1,3 @@
 MD5 f77be7e128c957bd3056c2e270b5f283 atk-1.6.1.tar.bz2 493415
+RMD160 139bebc0b1dfa448a65b0abb986e6d503836a17d atk-1.6.1.tar.bz2 493415
+SHA256 f9a05f797f0b23c7e2d88c428779c450718df2f187bd83dcf0a898adbda1b3ab atk-1.6.1.tar.bz2 493415
diff --git a/dev-libs/atk/files/digest-atk-1.9.1 b/dev-libs/atk/files/digest-atk-1.9.1
index 33254efc2477..5edf0283f30d 100644
--- a/dev-libs/atk/files/digest-atk-1.9.1
+++ b/dev-libs/atk/files/digest-atk-1.9.1
@@ -1 +1,3 @@
 MD5 689eb6a77215858eb804f6dcc90058be atk-1.9.1.tar.bz2 483363
+RMD160 7f6be9a2840dc15a73dc40d3c3bc89b6bbee5343 atk-1.9.1.tar.bz2 483363
+SHA256 65732d71c6c02e957673f49f8c5818f2cad3f451116b58ab1636c73dc8ab0dc6 atk-1.9.1.tar.bz2 483363