Do not use automake macros #408473 by Piotr Szymaniak.

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

5 files changed, 67 insertions, 20 deletions

diff --git a/games-sports/torcs/ChangeLog b/games-sports/torcs/ChangeLog
index cc7fb458ef1b..acbbd7633584 100644
--- a/games-sports/torcs/ChangeLog
+++ b/games-sports/torcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-sports/torcs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.34 2011/05/30 01:57:46 mr_bones_ Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/ChangeLog,v 1.35 2012/03/22 15:05:44 vapier Exp $
+
+  22 Mar 2012; Mike Frysinger <vapier@gentoo.org> torcs-1.3.1.ebuild,
+  files/torcs-1.3.1-libpng15.patch, +files/torcs-1.3.1-no-automake.patch:
+  Do not use automake macros #408473 by Piotr Szymaniak.
 
   30 May 2011; Michael Sterrett <mr_bones_@gentoo.org> torcs-1.3.1.ebuild,
   +files/torcs-1.3.1-libpng15.patch:
diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest
index a1c12cb364c3..41b58243b25c 100644
--- a/games-sports/torcs/Manifest
+++ b/games-sports/torcs/Manifest
@@ -1,6 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX torcs-1.3.1-as-needed.patch 3479 RMD160 7ead736dc188f4945314ef9acf7712f7c05c1989 SHA1 dd384fc8f8500a7fea1c86e1093052574c6d2dec SHA256 e8a0cae374209cd350d978ba5cbfb1756928db4e659b673b106c859acbcfbb55
-AUX torcs-1.3.1-libpng15.patch 516 RMD160 f4853bf2989d1200727d743af52295370d334177 SHA1 6c231fbce242e7c54317b892c1033dc570b127f8 SHA256 8fe1de4656ee42c6ef4910658e18999fa85e59711608d271834452d6eec62500
+AUX torcs-1.3.1-libpng15.patch 528 RMD160 163d8102326a7bdca778ffd214a27b59365e7703 SHA1 054d6d4ce7ca021df1fb9d3c1b76909d7bdfd842 SHA256 3b8a4ff0c927ca9996477d0a18e44de9ea1c73e07ebbab85023cb2b1cd3b5eb8
+AUX torcs-1.3.1-no-automake.patch 572 RMD160 2e3e59572e63bbf3611b61af54110d56e8c014f3 SHA1 e550a51f0a25ae72ac096fe30928b17d43775d35 SHA256 09ce29d3846a3333be436f1edb39044a443bd5818c930eda51d40d67e1d03c0c
 DIST torcs-1.3.1.tar.bz2 211422481 RMD160 4c03e4f3c4a5e5594d0560219ed215aa36b37595 SHA1 90a7cf9e6605d510d75103b4e1f28efc6faf933a SHA256 901b7baddbdc6c0aa343be1b35fe3ef2eb30100279ba9189d8ec8ed4b33d51fd
-EBUILD torcs-1.3.1.ebuild 1419 RMD160 0bf1b640b758c5eed86b060e9a1b9bc7e18d354f SHA1 6537d42dd93777580f18dfc091b4d0d18c014d24 SHA256 246719f42fb26edc321504ea4c42d550eba5a75a9ec0dc5f7643b0bbaa679325
-MISC ChangeLog 5265 RMD160 fb9a3024c54bc8619f80657b699b87bd9beb0fee SHA1 7083d07bcd2abf57036f25aa04d6f458da657f0a SHA256 67860079e0abd21236e86050526d0a227f29546d5faab481fca72ba6eafac69a
+EBUILD torcs-1.3.1.ebuild 1458 RMD160 6d19e1999c89e8ea2e40465f45a0fa6eb04b5b4b SHA1 ab393d4aa7b0fd222bf2f953ae22ae633b8c4ee9 SHA256 8b3f1a07da6a5c5a774c18b137f50f0e64107c8ff4c1311e39ba6ae1dc67dc3d
+MISC ChangeLog 5464 RMD160 260c764a734fb3724c9f94f8f136ebe360ed7a78 SHA1 6891686899ef26cea6b6a3256f79a4bade56b4b0 SHA256 30549093178b1a26cf0db626a7a11f381622d6e494f31da2c2433f4c7484d94d
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPaz/OAAoJELEHsLL7fEFWMqoQAMYG/i94f/CStFCMc4C0l3uz
+achSbKKFO+YiQoz81MP7EqLZ1DdSFVDeUdF0/DBV46M9JWH/SV0OrBOOeuEH2hU8
+ktT7O4Me/zAKPJS4+Go/tOnvgJ2AtBh+oNkNIfgQpwDgFDyl9gYM909ER2yWrZ8v
+YamA7iAzHVC9y4Tfgp3+2p9qwuTBMxg83MwJe55hBheNtUFqRy3vdtopuVIlrkHg
+KAPus1ru/Qj+xkyGta03CG2x3Aqd98CPbNG+GmV/9EqoyyB3gu3f7teyoB0OoUOQ
+KFn6scG6mraMh7V2YZ9B3dFd8yniwJiUHm780m0RGxGtuxNACaZNb+DeKfK4ACCR
+s2id+DoOLvbphTnj38P9RfLbDGeBysAfIH93Tp0LbIBKhET3MMq5N1f5ct9pcRyW
+b5T7e1hddruZBai7jeOur/HM+jkxBu3TCdTmxUtcMxjTl6yPEtiGepEOFfr3ct+7
+cLrz0xyY52S7sh3hZkm0DlV65y14wZDMugqqVeMToE4NBane4uLIH1VYjyfLDOkU
+h5i88NHMn+2SlIKC8xIgJ4+Cyp2EgmypqLoSJJv4sgLFh1wQx9GeOX69yKRew39U
+VU58eFao1EqfSCNglceSEJHk/cM2mg+PIMznjtXVHw/7FZHkPhIgEwu4H4Rwf5tE
+L3ArRCCKKWybjWmjQJcr
+=7Aew
+-----END PGP SIGNATURE-----
diff --git a/games-sports/torcs/files/torcs-1.3.1-libpng15.patch b/games-sports/torcs/files/torcs-1.3.1-libpng15.patch
index 6b09ce2a41c8..94f6d6c471e9 100644
--- a/games-sports/torcs/files/torcs-1.3.1-libpng15.patch
+++ b/games-sports/torcs/files/torcs-1.3.1-libpng15.patch
@@ -1,20 +1,20 @@
 --- a/src/libs/tgfclient/img.cpp
 +++ b/src/libs/tgfclient/img.cpp
 @@ -98,7 +98,7 @@
-		return (unsigned char *)NULL;
-	}
-	
+ 		return (unsigned char *)NULL;
+ 	}
+ 	
 -	if (setjmp(png_ptr->jmpbuf))
 +	if (setjmp(png_jmpbuf(png_ptr)))
-	{
-		/* Free all of the memory associated with the png_ptr and info_ptr */
-		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
 @@ -229,7 +229,7 @@
-		return -1;
-	}
-	
+ 		return -1;
+ 	}
+ 	
 -	if (setjmp(png_ptr->jmpbuf)) {    
 +	if (setjmp(png_jmpbuf(png_ptr))) {
-		png_destroy_write_struct(&png_ptr, &info_ptr);
-		fclose(fp);
-		return -1;
+ 		png_destroy_write_struct(&png_ptr, &info_ptr);
+ 		fclose(fp);
+ 		return -1;
diff --git a/games-sports/torcs/files/torcs-1.3.1-no-automake.patch b/games-sports/torcs/files/torcs-1.3.1-no-automake.patch
new file mode 100644
index 000000000000..a7a26f6a1f5c
--- /dev/null
+++ b/games-sports/torcs/files/torcs-1.3.1-no-automake.patch
@@ -0,0 +1,21 @@
+torcs doesn't use automake, so it shouldn't be calling the macro
+
+http://bugs.gentoo.org/408473
+
+--- a/configure.in
++++ b/configure.in
+@@ -14,9 +14,12 @@
+ #
+ ##############################################################################
+ 
+-AC_INIT(Make-config.in)
++AC_INIT(torcs, 1.3.1)
+ AC_CONFIG_HEADERS(config.h)
+-AM_INIT_AUTOMAKE(torcs, 1.3.1)
++dnl Workaround code using old VERSION instead of new PACKAGE_VERSION
++VERSION=$PACKAGE_VERSION
++AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [old VERSION workaround])
++AC_SUBST(VERSION)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
diff --git a/games-sports/torcs/torcs-1.3.1.ebuild b/games-sports/torcs/torcs-1.3.1.ebuild
index 4a4dbb10dbd4..b25a25665fb5 100644
--- a/games-sports/torcs/torcs-1.3.1.ebuild
+++ b/games-sports/torcs/torcs-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.1.ebuild,v 1.9 2011/05/30 01:57:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/torcs/torcs-1.3.1.ebuild,v 1.10 2012/03/22 15:05:44 vapier Exp $
 
 EAPI=2
 inherit autotools eutils multilib games
@@ -29,7 +29,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-no-automake.patch
 	eautoreconf
 	ecvs_clean
 }