Patch Makefile.in rather than Makefile.am so we dont need to run autotools #198936 by Michael.

Package-Manager: portage-2.1.3.19

4 files changed, 45 insertions, 31 deletions

diff --git a/games-board/gnubg/ChangeLog b/games-board/gnubg/ChangeLog
index 1fdab2280527..e87957aefaa6 100644
--- a/games-board/gnubg/ChangeLog
+++ b/games-board/gnubg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/gnubg
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.36 2007/10/15 14:28:46 corsair Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.37 2007/11/12 21:10:28 vapier Exp $
+
+  12 Nov 2007; Mike Frysinger <vapier@gentoo.org>
+  files/gnubg-0.14.3-as-needed.patch, gnubg-0.14.3-r1.ebuild:
+  Patch Makefile.in rather than Makefile.am so we dont need to run autotools
+  #198936 by Michael.
 
   15 Oct 2007; Markus Rothe <corsair@gentoo.org> gnubg-0.14.3-r1.ebuild:
   Stable on ppc64
diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
index 82a7051d21f7..6e75070c5dac 100644
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnubg-0.14.3-64bits.patch 2171 RMD160 b07cea2d81ce8508b38cbefa7ca13a152862fd2e SHA1 12a1e3fcb5d48401b6df4e9fc42ec1ffb70c0b4a SHA256 631572f633f7f86f071bb7497149dbeaf25666ae901f95d566d671286e5c0732
 MD5 0331fc35ec354c80d6412d978de148c1 files/gnubg-0.14.3-64bits.patch 2171
 RMD160 b07cea2d81ce8508b38cbefa7ca13a152862fd2e files/gnubg-0.14.3-64bits.patch 2171
 SHA256 631572f633f7f86f071bb7497149dbeaf25666ae901f95d566d671286e5c0732 files/gnubg-0.14.3-64bits.patch 2171
-AUX gnubg-0.14.3-as-needed.patch 663 RMD160 5fee6fd59dbaf749331ce1a1bdb41a8c2abc984e SHA1 5ea968a2ea20a7b144267a22c3432f1fe3edcaf5 SHA256 beca15462bb051736f1e56875dc64ddb9a5613698747fe831d2e420004a23335
-MD5 4e0bc2653e88cbde01cc8e478c34dafc files/gnubg-0.14.3-as-needed.patch 663
-RMD160 5fee6fd59dbaf749331ce1a1bdb41a8c2abc984e files/gnubg-0.14.3-as-needed.patch 663
-SHA256 beca15462bb051736f1e56875dc64ddb9a5613698747fe831d2e420004a23335 files/gnubg-0.14.3-as-needed.patch 663
+AUX gnubg-0.14.3-as-needed.patch 460 RMD160 b96427a49abe896405f292cfe568702c7cebe3ec SHA1 a0729862fc472201552b15cb98025f71f62337ab SHA256 2530b9a7434631629ca762fbc20cdfe5c35ecfce5ff4809637415ab965b00ba7
+MD5 af215d2e49aa20696fd716e0f029ccfb files/gnubg-0.14.3-as-needed.patch 460
+RMD160 b96427a49abe896405f292cfe568702c7cebe3ec files/gnubg-0.14.3-as-needed.patch 460
+SHA256 2530b9a7434631629ca762fbc20cdfe5c35ecfce5ff4809637415ab965b00ba7 files/gnubg-0.14.3-as-needed.patch 460
 AUX gnubg-0.14.3-blas.patch 284 RMD160 4a517b4f7984099c2deda3d9e7a45bc1b9324dc4 SHA1 d9fa2178f19fb80e470654e8be1570c709ac6a50 SHA256 1c86e885acecd617d67cd6b44ae99de1cdc23e91dcc955a5c475fa91261ed570
 MD5 33b27a4561dcdc383656b7bcbdcc5f80 files/gnubg-0.14.3-blas.patch 284
 RMD160 4a517b4f7984099c2deda3d9e7a45bc1b9324dc4 files/gnubg-0.14.3-blas.patch 284
@@ -18,18 +21,18 @@ DIST gnubg-0.14.3.tar.gz 4241526 RMD160 da7b2a3b52194ca11d505a70fba805e99f15c3ed
 DIST gnubg.weights-0.14.gz 460747 RMD160 5d588b1145f0d0489b5d70fa6cfccd9ce6738f04 SHA1 e828006193629063460b032f9a7da9761fdbc085 SHA256 6c134ded36d0875cb673a4f9fd84e2d30424935951baeffcd94852ccdb2daf70
 DIST gnubg_os0.bd.gz 906720 RMD160 83fefa3c39544ca9a51f1ba7ae5e8bd5215e631c SHA1 d038a338ee2998d8a61d90b89478eeac3ad464c8 SHA256 e84a36f133ee7ea9fa3686af6c111088b8b43906db1b6c6b3db0035c84cda809
 DIST gnubg_ts0.bd.gz 5899380 RMD160 9e0bea798a53374061014226aca9f5d2063133e8 SHA1 b7c4c18dfc2f3be6cd884444bdf523c8aef6ce41 SHA256 0934e4f2d84f5cd50c2ff4592c93c49d43f7cb89da342600736849c7362626d5
-EBUILD gnubg-0.14.3-r1.ebuild 3052 RMD160 bafe0f29eff413a192497e4f43aee8da8dd727d4 SHA1 2c42b9ba4dfc9557121bd13f474492476196c9b0 SHA256 5daea3a50d57360342adc81a2d12258db46ee8b559c25ba65c2a3e13ed3e677b
-MD5 172c44079c587dc1e62dedeac72842f7 gnubg-0.14.3-r1.ebuild 3052
-RMD160 bafe0f29eff413a192497e4f43aee8da8dd727d4 gnubg-0.14.3-r1.ebuild 3052
-SHA256 5daea3a50d57360342adc81a2d12258db46ee8b559c25ba65c2a3e13ed3e677b gnubg-0.14.3-r1.ebuild 3052
+EBUILD gnubg-0.14.3-r1.ebuild 3051 RMD160 e46bfbde3b27d2bc7d9446553fc85923e94e73f8 SHA1 87f82d54b0c4906786813e8283c522534e89705d SHA256 e642fad597dfa03c2f7cff439367c292da46ebf724d9308b5454923d09f5116e
+MD5 32b55b88fb09a50d3601957e34075cc5 gnubg-0.14.3-r1.ebuild 3051
+RMD160 e46bfbde3b27d2bc7d9446553fc85923e94e73f8 gnubg-0.14.3-r1.ebuild 3051
+SHA256 e642fad597dfa03c2f7cff439367c292da46ebf724d9308b5454923d09f5116e gnubg-0.14.3-r1.ebuild 3051
 EBUILD gnubg-0.14.3.ebuild 2798 RMD160 1ef52959895a5b24eb2643b915a8c11d2d15428c SHA1 adb272e1fdba7d69ae36633e1f906c954ec6e407 SHA256 9e0b861d338a2d89c1dae8db94022f5fcb7ec2520664603de8199678089da15b
 MD5 094b80065393dddfc2d0e602007c89f6 gnubg-0.14.3.ebuild 2798
 RMD160 1ef52959895a5b24eb2643b915a8c11d2d15428c gnubg-0.14.3.ebuild 2798
 SHA256 9e0b861d338a2d89c1dae8db94022f5fcb7ec2520664603de8199678089da15b gnubg-0.14.3.ebuild 2798
-MISC ChangeLog 4667 RMD160 56fbcbef3febda3556eea77d0140c7a9fcd89b8a SHA1 4e01909161d1c0ed6cb0771fda11657c8f72627b SHA256 c5f9e0152a220df9e9fc35365787068b30e85bb08ebe26343a385294596e50ef
-MD5 dd07c5fa62d5c900049444397aa13531 ChangeLog 4667
-RMD160 56fbcbef3febda3556eea77d0140c7a9fcd89b8a ChangeLog 4667
-SHA256 c5f9e0152a220df9e9fc35365787068b30e85bb08ebe26343a385294596e50ef ChangeLog 4667
+MISC ChangeLog 4878 RMD160 b77ea06f01eb3f00595a8e082ac4699d7f1f6e93 SHA1 2466f084bc5edabc4cb316e6290d580227b5d3b7 SHA256 7ce68167178bb3047b361bf5a204422fca14b138d830d730f9eb2d42b9e02e25
+MD5 fd3d229966d675242ec3873fd8185af0 ChangeLog 4878
+RMD160 b77ea06f01eb3f00595a8e082ac4699d7f1f6e93 ChangeLog 4878
+SHA256 7ce68167178bb3047b361bf5a204422fca14b138d830d730f9eb2d42b9e02e25 ChangeLog 4878
 MISC metadata.xml 251 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb SHA1 8134d1f2611a2e4387a89e84580a2cb5c25f5649 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe
 MD5 3f11aaf297b2fe67404a96cda13e9bfe metadata.xml 251
 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb metadata.xml 251
@@ -40,3 +43,10 @@ SHA256 887bd90f455fffd6d5bfdb8ba3befc1667c22bb0ff9ed6ee91e1f54eff84963c files/di
 MD5 73279a730dd0234f743d5326bdf41b6b files/digest-gnubg-0.14.3-r1 940
 RMD160 51f4904714d31dea82db728be317de6e1b90bcbe files/digest-gnubg-0.14.3-r1 940
 SHA256 887bd90f455fffd6d5bfdb8ba3befc1667c22bb0ff9ed6ee91e1f54eff84963c files/digest-gnubg-0.14.3-r1 940
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHOMFKp/wUKkr7RBoRAluDAJ9izonAqX68tdsW3YZciux0CRrgSgCggNiW
+pDwnnh1pTmFniBvsZO+mtzs=
+=Md6Q
+-----END PGP SIGNATURE-----
diff --git a/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch b/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch
index dac4af9209a0..ad2855603876 100644
--- a/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch
+++ b/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch
@@ -1,12 +1,11 @@
-diff -Nadurp gnubg-0.14.3/Makefile.am gnubg-0.14.3-as-needed/Makefile.am
---- gnubg-0.14.3/Makefile.am	2004-05-07 08:20:04.000000000 +0200
-+++ gnubg-0.14.3-as-needed/Makefile.am	2006-04-19 20:36:23.000000000 +0200
-@@ -120,7 +120,7 @@ gnubg_SOURCES = $(COMMON_SOURCES) gtkboa
- 	gtkpath.c gtkpath.h gtktoolbar.h gtktoolbar.c \
- 	$(BR1_SOURCES) $(SOUND_SOURCES) $(FONT_SOURCES) $(PYTHON_SOURCES) $(TIME_SOURCES)
- gnubg_LDADD = @GTK_LIBS@ $(COMMON_LIBS) $(SOUND_LIBS) $(PNG_LIBS) \
--        @LIBART_LIBS@ $(BOARD3D_LIBS) @THREAD_LIBS@
-+        @LIBART_LIBS@ $(BOARD3D_LIBS) @THREAD_LIBS@ -lutil
- gnubg_DEPENDENCIES = $(COMMON_DEPS) $(BOARD3D_DEPS)
- else
- ## --- Plain
+--- gnubg-0.14.3/Makefile.in
++++ gnubg-0.14.3/Makefile.in
+@@ -120,7 +120,7 @@
+ @USE_GTK_FALSE@ $(FONT_SOURCES)  $(PYTHON_SOURCES) $(TIME_SOURCES)
+
+ @USE_GTK_TRUE@gnubg_LDADD = @GTK_LIBS@ $(COMMON_LIBS) $(SOUND_LIBS) $(PNG_LIBS) \
+-@USE_GTK_TRUE@        @LIBART_LIBS@ $(BOARD3D_LIBS) @THREAD_LIBS@
++@USE_GTK_TRUE@        @LIBART_LIBS@ $(BOARD3D_LIBS) @THREAD_LIBS@ -lutil
+ 
+ @USE_GTK_FALSE@gnubg_LDADD = $(COMMON_LIBS) $(SOUND_LIBS) $(PNG_LIBS) @THREAD_LIBS@
+ 
diff --git a/games-board/gnubg/gnubg-0.14.3-r1.ebuild b/games-board/gnubg/gnubg-0.14.3-r1.ebuild
index cedc5f708be6..1aacec662f42 100644
--- a/games-board/gnubg/gnubg-0.14.3-r1.ebuild
+++ b/games-board/gnubg/gnubg-0.14.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-0.14.3-r1.ebuild,v 1.8 2007/10/15 14:28:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-0.14.3-r1.ebuild,v 1.9 2007/11/12 21:10:28 vapier Exp $
 
 inherit flag-o-matic eutils games
 
@@ -52,10 +52,10 @@ src_unpack() {
 		$(find . -name 'Makefile.in*') \
 		|| die "sed failed"
 	epatch \
-		"${FILESDIR}/${P}"-gcc4.patch \
-		"${FILESDIR}/${P}"-64bits.patch \
-		"${FILESDIR}/${P}"-blas.patch \
-		"${FILESDIR}/${P}"-as-needed.patch
+		"${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-64bits.patch \
+		"${FILESDIR}"/${P}-blas.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 }
 
 src_compile() {