dev-dotnet/libgdiplus: Fixed newer autoconf handling (bugs #217355 #224335)

Package-Manager: portage-2.1.4.4

4 files changed, 25 insertions, 9 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 8e8bfba2a78b..f90858b343b4 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.85 2008/05/31 12:22:19 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.86 2008/06/01 01:47:30 jurek Exp $
+
+  01 Jun 2008; Jurek Bartuszek <jurek@gentoo.org> libgdiplus-1.2.4.ebuild,
+  libgdiplus-1.9.ebuild:
+  Fixed newer autoconf versions handling (bugs #217355 #224335)
 
 *libgdiplus-1.9 (31 May 2008)
 
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index 845adf179127..c3d9fef93d2f 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -13,17 +13,17 @@ DIST libgdiplus-1.2.6.tar.bz2 2897855 RMD160 9eeb1f3859017e1b73d7b49d96cb103413a
 DIST libgdiplus-1.9.tar.bz2 2898771 RMD160 7d0f280365d0f5ae5b8d607cbe51921ea0c49b79 SHA1 36d7d8edd385544e53e8fba0da7236104373c712 SHA256 ca32b01263651d8ed11b4bcd7a7f9df9186f85b57682799bcf11a82a22e0a2d8
 EBUILD libgdiplus-1.2.2.ebuild 1691 RMD160 634949bf5700c2d9d07e624ec0cbf1e0a1286485 SHA1 ecd7fbcafbdeaca26a6123ed1229780300e1d2e7 SHA256 2572ae3196830c85a2a006cb4d98b40c1f63b8f44cd277e5b685b15288756586
 EBUILD libgdiplus-1.2.3.ebuild 1729 RMD160 258d106aeccc4ba1975768e48be5e99318e74ddd SHA1 7208ad7c3830dd100d585106f690aea1df3a9992 SHA256 bfb76e8b011ff104f2a9a7974a428a2039ad33753400c0c899547b0279ebf3d8
-EBUILD libgdiplus-1.2.4.ebuild 1765 RMD160 13c42cceba6f014452b893933a758e355ba3a3cf SHA1 92d92b357a814e493949a5ea593eadae561115c1 SHA256 4dfcfaab94a98f784ff33272f3f12a5f6d3fa657160dad5bc4f27ea6f3694f55
+EBUILD libgdiplus-1.2.4.ebuild 1912 RMD160 826851bd30bef44d5de4553c1375c08392055982 SHA1 4f2c6cd620b37cba07f29244ec4d45455f64689e SHA256 515b3802230299399af0cd2d95005156ed585a15267d167c0612b07f8011b42a
 EBUILD libgdiplus-1.2.5-r1.ebuild 1773 RMD160 3c00ba27386532dd2e748714ca664f7d6ec0cbd6 SHA1 ea58b4fb2097a6d5cb22c8d80f85aebee7955136 SHA256 7ddf33b2d8ef54449689582811e2c215195f096a1c5f09c112ba97904354cd22
 EBUILD libgdiplus-1.2.5.ebuild 1729 RMD160 0a1d733cb02d72c88d93fddd92a382fe82532d5a SHA1 792cb2c0f1f87daf98740091ef7f7be3778972ea SHA256 762aab82f5d220aceedbe1afdbfb8f99a348c47dc261eb74d658da5d7e34f13f
 EBUILD libgdiplus-1.2.6.ebuild 1835 RMD160 f84235aa5e641a9d8b7514eff56f8f642497da05 SHA1 0c2829a78689c62977d7bbf6c4fc20e6d666367d SHA256 ffb2dd40062608f1ebc3012a6f1ca359017a09cba0e537b90e93edb750385398
-EBUILD libgdiplus-1.9.ebuild 1710 RMD160 bef147403fc0b60a4739250a59c619e9077b238d SHA1 ff87f5084aa418caa74ed8c1512788a64a630175 SHA256 208c600e0c2d9e9728afc6069587f1ac436ee7e8159ed091fda6e67df17bf6f9
-MISC ChangeLog 14031 RMD160 ed31ffdf08c9b9287ea9f0f8168d6bd03919d08d SHA1 ec2d5305c7e630ce5c0817ad42bce6dd29bf64cc SHA256 3e2875f04c55f4ac92ce417cff19ec25800f6577ccec115e09c83592c491bc35
+EBUILD libgdiplus-1.9.ebuild 1934 RMD160 ba9ae735fb728f026fe42f5a7ec8e1a840013eb9 SHA1 2c1a2dbe9c524ae5c2a056be3f94e1cf9e4a8335 SHA256 260398d99199ec9cdd1ae1823f2f40a706cfed1e3327895a95721da988757b2c
+MISC ChangeLog 14196 RMD160 b928a9f5a3664a03e1d345ebae2919e9008c8903 SHA1 66f6393d49bb4a38b18be4075f345b7f92359e50 SHA256 6ef98e5a230ec5a7171746124bc777bd45f45e8335fd7386c236f71794c39524
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhBQwQACgkQyOePD61SuWIExgCfe5iE1UVWRcvJjLUyB3qRAjBB
-jDgAn3BUsJauqWlIOzYn3jboK0+EjMRl
-=JXlo
+iEYEARECAAYFAkhB/7oACgkQyOePD61SuWLLPQCfTdBMVn+xQofKQg8NxEBpGk2A
+fvYAnj/dN0nHUE+MW2B6LZj8a0RrqGFQ
+=RNMl
 -----END PGP SIGNATURE-----
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.2.4.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.2.4.ebuild
index 98b0bb8d2e75..b6422cd1e0d4 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.2.4.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.7 2008/04/18 22:19:04 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.2.4.ebuild,v 1.8 2008/06/01 01:47:30 jurek Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -35,6 +35,11 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-1.1.13-libungif-configure-fix.diff"
 	epatch "${FILESDIR}/${P}-cairo.patch"
+
+	sed -i \
+		-e 's/FONTCONFIG-CONFIG/FONTCONFIG_CONFIG/' \
+		-e 's/FREETYPE-CONFIG/FREETYPE_CONFIG/' \
+		configure.in || die 'configure.in not found'
 	eautoreconf
 }
 
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.9.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.9.ebuild
index 5aaee459760a..07565c185521 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.9.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.9.ebuild
@@ -1,6 +1,6 @@
 # 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.9.ebuild,v 1.1 2008/05/31 12:22:19 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.9.ebuild,v 1.2 2008/06/01 01:47:30 jurek Exp $
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -20,6 +20,7 @@ RDEPEND=">=dev-libs/glib-2.6
 		x11-libs/libXrender
 		x11-libs/libX11
 		x11-libs/libXt
+		x11-libs/cairo
 		 exif? ( media-libs/libexif )
 		 gif? ( >=media-libs/giflib-4.1.3 )
 		 jpeg? ( media-libs/jpeg )
@@ -35,6 +36,10 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-1.2.5-imglibs.patch"
 
+	sed -i \
+		-e 's/FONTCONFIG-CONFIG/FONTCONFIG_CONFIG/' \
+		-e 's/FREETYPE-CONFIG/FREETYPE_CONFIG/' \
+		configure.in || die 'configure.in not found'
 	eautoreconf
 }
 
@@ -47,6 +52,8 @@ src_compile() {
 
 	# Disable glitz support as libgdiplus does not use it, and it causes errors
 	econf --disable-glitz          \
+		--disable-dependency-tracking \
+		--with-cairo=system \
 		  $(use_with exif libexif) \
 		  $(use_with gif libgif)   \
 		  $(use_with jpeg libjpeg) \