Fix build with autoconf-2.65. Bug #297949

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 56 insertions, 18 deletions

diff --git a/games-puzzle/amoebax/ChangeLog b/games-puzzle/amoebax/ChangeLog
index d2781d24a58d..ee50e98611d2 100644
--- a/games-puzzle/amoebax/ChangeLog
+++ b/games-puzzle/amoebax/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/amoebax
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/ChangeLog,v 1.6 2009/06/13 18:13:11 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/ChangeLog,v 1.7 2010/01/09 18:59:58 tupone Exp $
+
+  09 Jan 2010; Tupone Alfredo <tupone@gentoo.org> amoebax-0.2.0.ebuild,
+  +files/amoebax-0.2.0-aclocal.patch:
+  Fix build with autoconf-2.65. Bug #297949 by flameeyes@gentoo.org
 
   13 Jun 2009; Tristan Heaven <nyhm@gentoo.org> amoebax-0.2.0.ebuild,
   +files/amoebax-0.2.0-glibc2.10.patch:
diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest
index f561229cf496..6103b40ef2c7 100644
--- a/games-puzzle/amoebax/Manifest
+++ b/games-puzzle/amoebax/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX amoebax-0.2.0-aclocal.patch 1604 RMD160 8226a6565c7fc5ee9ab5161641cbb4a3a5014727 SHA1 55ebfff3d4c543f7c36eb4d16152c2f3e71a4599 SHA256 c05d3aea55984de78fe43f7d6365109c5096c4e358956a5c50107d4e279c578f
 AUX amoebax-0.2.0-gcc43.patch 1765 RMD160 a5521f0e29e2e7781704ca4e3ba4abf20f44f5ba SHA1 178091ea8dc0a6ca4a1150054b10ebb151d8ab04 SHA256 86d0644119cbdad92a28667d945e7da0b7789566077a1a8947e343c8e0c256d5
 AUX amoebax-0.2.0-glibc2.10.patch 250 RMD160 8bf95b3ad79b91473d7c82f0ec6a57a7cee309ab SHA1 e366d2b0802b0c5571b3279342ec03eb488e1828 SHA256 dfd3d92bcf95749cfb4f0e0725bffe7750245efccdc7dc3f1238d8bd49d879b4
 DIST amoebax-0.2.0.tar.bz2 10565913 RMD160 f602d4ddef217b9759c4ed16604b19edb04106d1 SHA1 84f45f0363782c4ea7040315cbd0a43f143a5b8a SHA256 77c9da7b424432c55d76a74b62bf01ccba3120200bb89fd5815993c001c7eaae
-EBUILD amoebax-0.2.0.ebuild 1073 RMD160 623254940a4c251d02c6dc24931401945d449e15 SHA1 0a8ec2c05715b695b3469d68b261d3d6ec4466f1 SHA256 ba7aa28e837b3e2b787cd5d5af2014a405fb90fd732baf045d4a2ae935635d02
-MISC ChangeLog 945 RMD160 cc011abc229f3ce0b19702ab69ebf80388f784d0 SHA1 797dfcab88f95c1d2627f4257dfb87946cc6b1de SHA256 63a060c07c13ad54dc764e35cfa5023c5e017d6f7658fbe2c1f01a7913fa236a
+EBUILD amoebax-0.2.0.ebuild 1133 RMD160 10c396fdc6d2a23d61424d0d003083e5a28db80f SHA1 da88d750906c725f7cd45ce0d1d000a624af5a3b SHA256 8f1300ed7ebd45b59024e2fd4f72671bffb17be870607da85991a1bfa364ea96
+MISC ChangeLog 1126 RMD160 f0ea3d95e5ad47d79a6c2f7a22205e53d505dc7a SHA1 d728586f51bb175791cda770d916b91facf14227 SHA256 5612abc34dc1a6e3826515bc7463c8c61ce3b848b60d0764aa3eaf89e58324c4
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoz7D4ACgkQdz7hIScOURHJsgCfUUUWo9iFH41Q/28V8uK6UTSQ
-6GUAoLtbRVFPUVD+nAiQFT85LL5vc/AD
-=w86e
------END PGP SIGNATURE-----
diff --git a/games-puzzle/amoebax/amoebax-0.2.0.ebuild b/games-puzzle/amoebax/amoebax-0.2.0.ebuild
index da22ddbd53d6..53f196342b8f 100644
--- a/games-puzzle/amoebax/amoebax-0.2.0.ebuild
+++ b/games-puzzle/amoebax/amoebax-0.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/amoebax-0.2.0.ebuild,v 1.6 2009/06/13 18:13:11 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/amoebax/amoebax-0.2.0.ebuild,v 1.7 2010/01/09 18:59:58 tupone Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -14,14 +14,16 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch
+		"${FILESDIR}"/${P}-glibc2.10.patch \
+		"${FILESDIR}"/${P}-aclocal.patch
 	sed -i \
 		-e "/^SUBDIRS/s:doc ::" \
 		Makefile.am \
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.0-aclocal.patch b/games-puzzle/amoebax/files/amoebax-0.2.0-aclocal.patch
new file mode 100644
index 000000000000..312585900309
--- /dev/null
+++ b/games-puzzle/amoebax/files/amoebax-0.2.0-aclocal.patch
@@ -0,0 +1,41 @@
+--- m4/objc.m4.old	2010-01-09 19:41:58.000000000 +0100
++++ m4/objc.m4	2010-01-09 19:43:35.000000000 +0100
+@@ -448,32 +448,32 @@
+ 
+ # AC_LANG_SOURCE(Objective C)(BODY)
+ # ---------------------------------
+-m4_copy([AC_LANG_SOURCE(C)], [AC_LANG_SOURCE(Objective C)])
++m4_copy_force([AC_LANG_SOURCE(C)], [AC_LANG_SOURCE(Objective C)])
+ 
+ 
+ # AC_LANG_PROGRAM(Objective C)([PROLOGUE], [BODY])
+ # ------------------------------------------------
+-m4_copy([AC_LANG_PROGRAM(C)], [AC_LANG_PROGRAM(Objective C)])
++m4_copy_force([AC_LANG_PROGRAM(C)], [AC_LANG_PROGRAM(Objective C)])
+ 
+ 
+ # AC_LANG_CALL(Objective C)(PROLOGUE, FUNCTION)
+ # ---------------------------------------------
+-m4_copy([AC_LANG_CALL(C)], [AC_LANG_CALL(Objective C)])
++m4_copy_force([AC_LANG_CALL(C)], [AC_LANG_CALL(Objective C)])
+ 
+ 
+ # AC_LANG_FUNC_LINK_TRY(Objective C)(FUNCTION)
+ # --------------------------------------------
+-m4_copy([AC_LANG_FUNC_LINK_TRY(C)], [AC_LANG_FUNC_LINK_TRY(Objective C)])
++m4_copy_force([AC_LANG_FUNC_LINK_TRY(C)], [AC_LANG_FUNC_LINK_TRY(Objective C)])
+ 
+ 
+ # AC_LANG_BOOL_COMPILE_TRY(Objective C)(PROLOGUE, EXPRESSION)
+ # -----------------------------------------------------------
+-m4_copy([AC_LANG_BOOL_COMPILE_TRY(C)], [AC_LANG_BOOL_COMPILE_TRY(Objective C)])
++m4_copy_force([AC_LANG_BOOL_COMPILE_TRY(C)], [AC_LANG_BOOL_COMPILE_TRY(Objective C)])
+ 
+ 
+ # AC_LANG_INT_SAVE(Objective C)(PROLOGUE, EXPRESSION)
+ # ---------------------------------------------------
+-m4_copy([AC_LANG_INT_SAVE(C)], [AC_LANG_INT_SAVE(Objective C)])
++m4_copy_force([AC_LANG_INT_SAVE(C)], [AC_LANG_INT_SAVE(Objective C)])
+ 
+ 
+