Fix for bug #115710 and bump for new release.

(Portage version: 2.0.53)

6 files changed, 116 insertions, 22 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index cf3425c6dfeb..6e67af8128d7 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.45 2005/11/14 05:05:18 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.46 2005/12/22 09:07:32 latexer Exp $
+
+*libgdiplus-1.1.11 (22 Dec 2005)
+
+  22 Dec 2005; Peter Johanson <latexer@gentoo.org>
+  +files/libgdiplus-1.1.10-libungif-configure-fix.diff,
+  libgdiplus-1.1.10.ebuild, +libgdiplus-1.1.11.ebuild:
+  Fix for bug #115710 and bump for new release.
 
 *libgdiplus-1.1.10 (14 Nov 2005)
 
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index e52e41a65e81..08aed5c5896a 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,26 +1,28 @@
-MD5 f1f7a08fc8d14a32411a71bb1b51d7ea libgdiplus-1.1.8.ebuild 1573
 MD5 a1042caa522a57bef5524f9c30c5da0d ChangeLog 7926
-MD5 a6614575798e40bc922ce2c1ed2a05c7 libgdiplus-1.0.5-r3.ebuild 1503
-MD5 5f5de8057dfa705eb9320fe00909f00a libgdiplus-1.0.6-r2.ebuild 1505
-MD5 2ca22b339a9e83bf9a73bc248ac17aa4 libgdiplus-1.1.9.1.ebuild 1691
-MD5 2bcbc44541ea5aed24f664aad9bf7f0f libgdiplus-1.1.9.2.ebuild 1809
-MD5 c8a29932bd86fccfebf58c854072f478 libgdiplus-1.1.10.ebuild 1764
-MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
-MD5 606acb6e7c0ef822f28f9fb67b50a28f libgdiplus-1.0.6.ebuild 1356
-MD5 ddb453b524ee81a3b0788c201419c649 libgdiplus-1.0.5-r4.ebuild 1541
-MD5 f086a5ca446a81f9c76c0d94f885fab4 libgdiplus-1.0.6-r3.ebuild 1517
-MD5 19b411b048591ef4b4e015f0dc26cf76 files/libgdiplus-1.1.4-giflib.diff 2297
-MD5 3ef156941c1a08fe328a986a2eb19097 files/libgdiplus-1.0.5-cairo-0.3.0-compat.diff 14182
-MD5 5588de6bd956056e540361d2ca4cbbb5 files/libgdiplus-1.1.5-nogif.diff 432
-MD5 485f5e7481393d8b20a49b29d1728fac files/libgdiplus-1.0.6-giflib.diff 2261
+MD5 dfc3fef3162bdae151dac1e1a730054e files/digest-libgdiplus-1.0.5-r3 68
+MD5 dfc3fef3162bdae151dac1e1a730054e files/digest-libgdiplus-1.0.5-r4 68
 MD5 e513a9ab6f55d63191841b053a9f1c4b files/digest-libgdiplus-1.0.6 68
-MD5 37699b78babed5fa31a7ddb0a8937c22 files/libgdiplus-1.1.8-giflib.diff 2461
-MD5 72be9aea1153a84083e40505c54b6d7a files/digest-libgdiplus-1.1.8 69
+MD5 e513a9ab6f55d63191841b053a9f1c4b files/digest-libgdiplus-1.0.6-r2 68
+MD5 e513a9ab6f55d63191841b053a9f1c4b files/digest-libgdiplus-1.0.6-r3 68
 MD5 3b3b17c59f34b72c15586d26002d767a files/digest-libgdiplus-1.1.10 70
+MD5 133aaf078983dc3a67ace5b6f5127cb0 files/digest-libgdiplus-1.1.11 70
+MD5 72be9aea1153a84083e40505c54b6d7a files/digest-libgdiplus-1.1.8 69
 MD5 1ff9bb0755cb51e5c2dbefe1d75ed967 files/digest-libgdiplus-1.1.9.1 71
-MD5 dfc3fef3162bdae151dac1e1a730054e files/digest-libgdiplus-1.0.5-r3 68
 MD5 601416f6b18366e128c76a034b3299d9 files/digest-libgdiplus-1.1.9.2 71
-MD5 e513a9ab6f55d63191841b053a9f1c4b files/digest-libgdiplus-1.0.6-r2 68
+MD5 3ef156941c1a08fe328a986a2eb19097 files/libgdiplus-1.0.5-cairo-0.3.0-compat.diff 14182
+MD5 485f5e7481393d8b20a49b29d1728fac files/libgdiplus-1.0.6-giflib.diff 2261
+MD5 19b411b048591ef4b4e015f0dc26cf76 files/libgdiplus-1.1.4-giflib.diff 2297
 MD5 07efe1db5bae7a73722aac0e952b4e2f files/libgdiplus-1.1.4-included-cairo-fix.diff 1223
-MD5 e513a9ab6f55d63191841b053a9f1c4b files/digest-libgdiplus-1.0.6-r3 68
-MD5 dfc3fef3162bdae151dac1e1a730054e files/digest-libgdiplus-1.0.5-r4 68
+MD5 5588de6bd956056e540361d2ca4cbbb5 files/libgdiplus-1.1.5-nogif.diff 432
+MD5 37699b78babed5fa31a7ddb0a8937c22 files/libgdiplus-1.1.8-giflib.diff 2461
+MD5 a6614575798e40bc922ce2c1ed2a05c7 libgdiplus-1.0.5-r3.ebuild 1503
+MD5 ddb453b524ee81a3b0788c201419c649 libgdiplus-1.0.5-r4.ebuild 1541
+MD5 5f5de8057dfa705eb9320fe00909f00a libgdiplus-1.0.6-r2.ebuild 1505
+MD5 f086a5ca446a81f9c76c0d94f885fab4 libgdiplus-1.0.6-r3.ebuild 1517
+MD5 606acb6e7c0ef822f28f9fb67b50a28f libgdiplus-1.0.6.ebuild 1356
+MD5 4705c73b4ead4ceac1a6db840fd8a4ec libgdiplus-1.1.10.ebuild 1817
+MD5 be1a9a7fcafeea9ac951addf0d632926 libgdiplus-1.1.11.ebuild 1825
+MD5 f1f7a08fc8d14a32411a71bb1b51d7ea libgdiplus-1.1.8.ebuild 1573
+MD5 2ca22b339a9e83bf9a73bc248ac17aa4 libgdiplus-1.1.9.1.ebuild 1691
+MD5 2bcbc44541ea5aed24f664aad9bf7f0f libgdiplus-1.1.9.2.ebuild 1809
+MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.11 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.11
new file mode 100644
index 000000000000..4e78f1a99097
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.11
@@ -0,0 +1 @@
+MD5 c0de8ffb854029431e0f60bda8f34032 libgdiplus-1.1.11.tar.gz 1255643
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.10-libungif-configure-fix.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.10-libungif-configure-fix.diff
new file mode 100644
index 000000000000..32eba37c584f
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.10-libungif-configure-fix.diff
@@ -0,0 +1,14 @@
+diff -aur libgdiplus-1.1.10-orig/configure.in libgdiplus-1.1.10/configure.in
+--- libgdiplus-1.1.10-orig/configure.in	2005-11-09 19:08:08.000000000 -0800
++++ libgdiplus-1.1.10/configure.in	2005-12-22 00:53:51.000000000 -0800
+@@ -207,8 +207,8 @@
+       AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))
+   fi
+ 
+-if ! test x$GIF != x; then
+-   AC_CHECK_LIB(gif, DGifOpenFileName,
++if test x$with_libgif != xno && ! test x$GIF != x; then
++   AC_CHECK_LIB(ungif, DGifOpenFileName,
+       [AC_CHECK_HEADER(gif_lib.h,
+ 	GIF='ungif'; LIBGIF='-lungif',
+ 	AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))],
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.10.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.10.ebuild
index 765738614c47..716f0f1e01cc 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.1.10.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.1.10.ebuild,v 1.1 2005/11/14 05:05:18 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.1.10.ebuild,v 1.2 2005/12/22 09:07:32 latexer Exp $
 
 inherit libtool eutils flag-o-matic toolchain-funcs
 
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${P}-libungif-configure-fix.diff
 	libtoolize --copy --force || die "libtoolize failed"
 	autoheader || die "autoheader failed"
 	aclocal || die "aclocal failed"
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.11.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.11.ebuild
new file mode 100644
index 000000000000..1028780becaf
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.1.11.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.1.11.ebuild,v 1.1 2005/12/22 09:07:32 latexer Exp $
+
+inherit libtool eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Library for using System.Drawing with Mono"
+
+HOMEPAGE="http://www.go-mono.com/"
+
+SRC_URI="http://www.go-mono.com/sources/${PN}-${PV:0:3}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="tiff gif jpeg png"
+
+RDEPEND="|| ( (	x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXt )
+	virtual/x11 )
+	dev-libs/glib
+	media-libs/freetype
+	tiff? ( media-libs/tiff )
+	gif? ( >=media-libs/giflib-4.1.3 )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	sys-devel/automake
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.1.10-libungif-configure-fix.diff
+	libtoolize --copy --force || die "libtoolize failed"
+	autoheader || die "autoheader failed"
+	aclocal || die "aclocal failed"
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
+}
+
+src_compile() {
+	if [ "$(gcc-major-version)" -gt "3" ] || \
+		( [ "$(gcc-major-version)" == "3" ] && \
+			[ "$(gcc-minor-version)" -gt "3" ] )
+	then
+		append-flags -fno-inline-functions
+	fi
+
+	local myconf="--with-cairo=included --disable-glitz"
+	use tiff ||  myconf="--without-libtiff ${myconf}"
+	use gif ||  myconf="--without-libgif ${myconf}"
+	use jpeg ||  myconf="--without-libjpeg ${myconf}"
+	use png ||  myconf="--without-libpng ${myconf}"
+
+	econf ${myconf} || die
+	# attribute((__stdcall__)) generate warnings on ppc
+	use ppc && sed -i -e 's:-Werror::g' src/Makefile
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog NEWS README
+}