add patch for newer automake

Package-Manager: portage-2.1.5_rc2

4 files changed, 36 insertions, 16 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index ae007cf4b3c8..5d08b8fddbd0 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.82 2008/03/12 13:54:35 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.83 2008/04/18 22:13:25 compnerd Exp $
+
+  18 Apr 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/libgdiplus-1.2.6-autotool-variables.patch, libgdiplus-1.2.6.ebuild:
+  Add patch for newer automake
 
   12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Peter Johanson (latexer, #206688) from metadata.xml.
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index a8d70b50f0ba..d34ce11f62df 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libgdiplus-1.1.13-libungif-configure-fix.diff 528 RMD160 456f3711ef77ebe406e051894e8159f38b4ebe61 SHA1 c4057ebe35183b2b21584fe551fcd4e79c456dad SHA256 1db9e2b00356602233a227c378fff03e8e80e64f439e65262379b82c69a93a93
 AUX libgdiplus-1.2.4-cairo.patch 395 RMD160 145c58e3bbbd719011d62ea5df12b42b57fe52b4 SHA1 45733b28559a78b81dd6d5ff56b6e8f9cf9879e9 SHA256 2436ae7e5e6309f1a9de0c82edb3e782a8661b5a46453564231fa230f2bbb242
 AUX libgdiplus-1.2.5-imglibs.patch 5743 RMD160 0c42aaf53d7e46489cd203f3633a487bb8e1146f SHA1 29bebd9434a818abcefc64caa2cba69a5dff3b38 SHA256 3c54fdead42729e8c8b6f9103b413c51df4a29273aa5a7def505b4abc1613fed
+AUX libgdiplus-1.2.6-autotool-variables.patch 1025 RMD160 320f836ab095e8eb8c453fc568a141561746c81d SHA1 2bfba4793df7ba087a6b547275a5c8a816239d33 SHA256 c2d4123b50e514fbd4eaf2a2bf27646d92e7c5105156dffc8c2513b19d1998f5
 DIST libgdiplus-1.2.2.tar.gz 2968362 RMD160 403c73cda029fac34a16093ae3449697d26c0f77 SHA1 aa82bbe49a7251bb055a9a60e4583cd7720cefc0 SHA256 1f54922c9bc9386cb116ef872a346bfb26b9dc530060dada7bf39e00f72dc0ec
 DIST libgdiplus-1.2.3.tar.gz 2991934 RMD160 9569f98bc1b987ec8f45ec92ede2f88bf7a36ad7 SHA1 313a1031ecb19c017453f4fa9c44651b8c4ddeb5 SHA256 6278edb273ff79a4fb896adf818792537a2977095e73ac74f5b31d50dead9dfa
 DIST libgdiplus-1.2.4.tar.bz2 2848526 RMD160 90d17f78ba50256d71478c105bbba0a30b68ab3e SHA1 53498e13ba0756ff1cb8a0b6227044dbc6bb3603 SHA256 373af7c1cf80d765e25a843ee69fe50809defab25a3e3a6df8ef974a47cb1326
@@ -14,13 +12,6 @@ EBUILD libgdiplus-1.2.3.ebuild 1723 RMD160 3e071cdfccf5c7ad187815d45637342dd5b40
 EBUILD libgdiplus-1.2.4.ebuild 1759 RMD160 5f7dd00fa6832f8796ab4e2d60797733a8359614 SHA1 cc102d7903a1f7a39551a94744b27c118749b314 SHA256 81273116f6498a3b23771be7e2a280df97ea17435b5f246e397d1ca418ea82bf
 EBUILD libgdiplus-1.2.5-r1.ebuild 1764 RMD160 f610ed64478dd57e8d79650996ed37ea688e3085 SHA1 f687ff4425a458acd79c27dd5a0b00ec06cf04fd SHA256 edbecf19c9a5c12ff78d5ee7429013debcd2e91041b14cdbd1e835b16de43828
 EBUILD libgdiplus-1.2.5.ebuild 1722 RMD160 0cf630dbeb94ffd1be8f8fb29c597df1b0d6dbb1 SHA1 86efedc11bee4d4e2de8e18dfb59dd7059c69d76 SHA256 1b6d78753549d017105df7091ea6c269b594da491d3b2fe1dcf1b9633c90f785
-EBUILD libgdiplus-1.2.6.ebuild 1773 RMD160 4952154236bdb63bd25abbf3cdb113d0e7a79669 SHA1 0cd65c0ef6916ba1909d0288ba49d83660189cb2 SHA256 e26f57fc77eb15f7b7b44c9e037a37f1d6c591a5ceebd4952ad57f6d8ce97ce5
-MISC ChangeLog 13516 RMD160 624de8222510074cf4912ebbf85aae4ee8f145cc SHA1 df6ca6d3aecac5b18719e053b1bfb96cded43ac6 SHA256 4f7c16b7fba9176e0ea4e69519116e13e07e5a97f50828daa2bd697ecf508098
+EBUILD libgdiplus-1.2.6.ebuild 1835 RMD160 f84235aa5e641a9d8b7514eff56f8f642497da05 SHA1 0c2829a78689c62977d7bbf6c4fc20e6d666367d SHA256 ffb2dd40062608f1ebc3012a6f1ca359017a09cba0e537b90e93edb750385398
+MISC ChangeLog 13683 RMD160 af26a6f9e8344918735aeebe0963983ba45329f3 SHA1 c7f597bb857fe34867b98d4ccaeeee29be260302 SHA256 cac459ff4344f0e626583f1442a806a7f85960ab69a8d397a10a675fcdbb22ef
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH1+CgyuNVb5qfaOYRAuDwAJ9WvcHy1MsLxuI1B6IxaeAgfIGszgCfY+R1
-iUtg9b9Hgf7X4jOnd1j1S9Q=
-=SRSw
------END PGP SIGNATURE-----
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.2.6-autotool-variables.patch b/dev-dotnet/libgdiplus/files/libgdiplus-1.2.6-autotool-variables.patch
new file mode 100644
index 000000000000..771e7e9aaa4d
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-1.2.6-autotool-variables.patch
@@ -0,0 +1,24 @@
+--- configure.in.orig	2008-04-18 11:20:31.000000000 -0500
++++ configure.in	2008-04-18 11:21:01.000000000 -0500
+@@ -66,8 +66,8 @@
+ PKG_CHECK_MODULES(FONTCONFIG, fontconfig,
+ 	[fontconfig_pkgconfig=yes], [fontconfig_pkgconfig=no])
+ if test "x$FONTCONFIG" = "xno"; then
+-	AC_PATH_PROG(FONTCONFIG-CONFIG, fontconfig-config, no)
+-	if test "x$FONTCONFIG-CONFIG" = "xyes"; then
++	AC_PATH_PROG(FONTCONFIG_CONFIG, fontconfig-config, no)
++	if test "x$FONTCONFIG_CONFIG" = "xyes"; then
+ 		FONTCONFIG_CFLAGS="`fontconfig-config --cflags`"
+ 		FONTCONFIG_LIBS="`fontconfig-config --libs`"
+ 	fi
+@@ -78,8 +78,8 @@
+ PKG_CHECK_MODULES(FREETYPE2, freetype2,
+ 	[freetype2_pkgconfig=yes], freetype2_pkgconfig=no])
+ if test "x$FREETYPE2" = "xno"; then
+-	AC_PATH_PROG(FREETYPE-CONFIG, freetype-config, no)
+-	if test "x$FREETYPE-CONFIG" = "xyes"; then
++	AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
++	if test "x$FREETYPE_CONFIG" = "xyes"; then
+ 		FREETYPE2_CFLAGS="`freetype-config --cflags`"
+ 		FREETYPE2_LIBS="`freetype-config --libs`"
+ 	fi
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.2.6.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.2.6.ebuild
index d6bf71d3caa0..2a36257e1058 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.2.6.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.2.6.ebuild,v 1.1 2007/12/14 19:29:12 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.2.6.ebuild,v 1.2 2008/04/18 22:13:25 compnerd Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -34,7 +34,8 @@ src_unpack() {
 	cd "${S}"
 
 	#epatch ${FILESDIR}/${PN}-1.1.13-libungif-configure-fix.diff
-	epatch "${FILESDIR}"/${PN}-1.2.5-imglibs.patch
+	epatch "${FILESDIR}/${PN}-1.2.5-imglibs.patch"
+	epatch "${FILESDIR}/${PN}-1.2.6-autotool-variables.patch"
 	eautoreconf
 }