Bumpity bump. Includes fix to use giflib instead of libungif. See bug #85720.

(Portage version: 2.0.51.19)

5 files changed, 129 insertions, 1 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 8dafaa9e8a50..775df2d242b0 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2005/03/15 00:47:43 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.24 2005/03/25 21:43:51 latexer Exp $
+
+*libgdiplus-1.1.5 (25 Mar 2005)
+
+  25 Mar 2005; Peter Johanson <latexer@gentoo.org>
+  +files/libgdiplus-1.1.4-giflib.diff, +libgdiplus-1.1.5.ebuild:
+  Bumpity bump. Includes fix to use giflib instead of libungif. See bug #85720.
 
   14 Mar 2005; Peter Johanson <latexer@gentoo.org> -libgdiplus-1.0.2.ebuild,
   libgdiplus-1.0.4-r1.ebuild, -libgdiplus-1.0.4.ebuild,
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index 8077acad3947..41f6640cb319 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -2,13 +2,16 @@ MD5 6d4dd24af57651076712c2751c5569c7 libgdiplus-1.0.6-r1.ebuild 1435
 MD5 3361b26fb496f5f715faf24a8ede5cb5 libgdiplus-1.1.4.ebuild 1450
 MD5 2ef995afdd6fd2e40b55b357d8744104 libgdiplus-1.0.5-r1.ebuild 1344
 MD5 f98083b4e7e5b18649f29637e0070767 libgdiplus-1.0.4-r1.ebuild 1282
+MD5 55187944d567d549f836a6430de76a4d libgdiplus-1.1.5.ebuild 1545
 MD5 7a160a8763e6b52ffa74eda1ddcca08f libgdiplus-1.0.5-r2.ebuild 1424
 MD5 14986be94174ab1a688a9e4bcb1748d1 ChangeLog 3816
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 MD5 4734220b46fdf8a1db9b84401c92c9b9 libgdiplus-1.0.6.ebuild 1342
+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 e513a9ab6f55d63191841b053a9f1c4b files/digest-libgdiplus-1.0.6 68
 MD5 8c3dae5b0b5642de968450f13c111900 files/digest-libgdiplus-1.1.4 69
+MD5 4fc6059d4ee42e5ef7b5db1c92fc0628 files/digest-libgdiplus-1.1.5 69
 MD5 56f2c6dbb46efdb52c857c5cf107da2e files/digest-libgdiplus-1.0.4-r1 68
 MD5 dfc3fef3162bdae151dac1e1a730054e files/digest-libgdiplus-1.0.5-r1 68
 MD5 dfc3fef3162bdae151dac1e1a730054e files/digest-libgdiplus-1.0.5-r2 68
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.5 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.5
new file mode 100644
index 000000000000..223d962663b7
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.5
@@ -0,0 +1 @@
+MD5 369ba22e934364dc6f0052e4a3f662fe libgdiplus-1.1.5.tar.gz 1316565
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-giflib.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-giflib.diff
new file mode 100644
index 000000000000..14ea64578846
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-1.1.4-giflib.diff
@@ -0,0 +1,59 @@
+diff -aur libgdiplus-1.1.4-cairo-fix-orig/configure.in libgdiplus-1.1.4-cairo-fix/configure.in
+--- libgdiplus-1.1.4-cairo-fix-orig/configure.in	2005-03-20 20:58:49.000000000 -0500
++++ libgdiplus-1.1.4-cairo-fix/configure.in	2005-03-20 20:49:51.000000000 -0500
+@@ -140,7 +140,7 @@
+ AC_ARG_WITH(libtiff,
+ 	[AC_HELP_STRING([--without-libtiff], [disable TIFF file IO])])
+ AC_ARG_WITH(libungif,
+-	[AC_HELP_STRING([--without-libungif], [disable GIF file IO])])
++	[AC_HELP_STRING([--without-libgif], [disable GIF file IO])])
+ AC_ARG_WITH(libpng,
+ 	[AC_HELP_STRING([--without-libpng], [disable PNG file IO])])
+ 
+@@ -197,17 +197,17 @@
+ fi
+ 
+ dnl Test for libungif
+-  if test x$with_libungif != xno && test -z "$LIBUNGIF"; then
+-    AC_CHECK_LIB(ungif, DGifOpenFileName,
++  if test x$with_libgif != xno && test -z "$LIBGIF"; then
++    AC_CHECK_LIB(gif, DGifOpenFileName,
+       [AC_CHECK_HEADER(gif_lib.h,
+-        UNGIF='ungif'; LIBUNGIF='-lungif',
+-	AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))],
+-      AC_MSG_WARN(*** GIF loader will not be built (ungiflibrary not found) ***))
++        GIF='ungif'; LIBGIF='-lgif',
++	AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))],
++      AC_MSG_WARN(*** GIF loader will not be built (giflibrary not found) ***))
+   fi
+ 
+-if test x$UNGIF != x; then
+-  GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBUNGIF"
+-  AC_DEFINE(HAVE_LIBUNGIF, 1, Define if gif support is available)
++if test x$GIF != x; then
++  GDIPLUS_LIBS="$GDIPLUS_LIBS $LIBGIF"
++  AC_DEFINE(HAVE_LIBGIF, 1, Define if gif support is available)
+ fi
+ 
+ dnl Test for libpng
+@@ -271,7 +271,7 @@
+ echo $ECHO_N "      - JPEG: "
+ test ! x$JPEG = x && echo yes || echo no 
+ echo $ECHO_N "      - GIF: "
+-test ! x$UNGIF = x && echo yes || echo no 
++test ! x$GIF = x && echo yes || echo no 
+ echo $ECHO_N "      - PNG: "
+ test ! x$PNG = x && echo yes || echo no 
+ echo ""
+diff -aur libgdiplus-1.1.4-cairo-fix-orig/src/gifcodec.c libgdiplus-1.1.4-cairo-fix/src/gifcodec.c
+--- libgdiplus-1.1.4-cairo-fix-orig/src/gifcodec.c	2005-01-26 20:33:54.000000000 -0500
++++ libgdiplus-1.1.4-cairo-fix/src/gifcodec.c	2005-03-20 21:13:18.000000000 -0500
+@@ -34,7 +34,7 @@
+ #include "gdipImage.h"
+ #include "gifcodec.h"
+ 
+-#ifdef HAVE_LIBUNGIF
++#ifdef HAVE_LIBGIF
+ 
+ #include <gif_lib.h>
+ 
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.5.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.5.ebuild
new file mode 100644
index 000000000000..52356e23af79
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.1.5.ebuild
@@ -0,0 +1,59 @@
+# 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.5.ebuild,v 1.1 2005/03/25 21:43:51 latexer Exp $
+
+inherit libtool eutils
+
+DESCRIPTION="Library for using System.Drawing with Mono"
+
+HOMEPAGE="http://www.go-mono.com/"
+
+SRC_URI="http://www.go-mono.com/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="tiff gif jpeg png"
+
+DEPEND="sys-devel/libtool
+		sys-devel/automake
+		sys-devel/autoconf
+		>=x11-libs/cairo-0.3.0
+		tiff? ( media-libs/tiff )
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		png? ( media-libs/libpng )"
+
+RDEPEND=">=dev-lang/mono-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.1.4-included-cairo-fix.diff || die
+	epatch ${FILESDIR}/${PN}-1.1.4-giflib.diff || die
+	libtoolize --copy --force || die "libtoolize failed"
+	autoheader || die "autoheader failed"
+	aclocal || die "aclocal failed"
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
+}
+
+src_compile() {
+	local myconf="--with-cairo=installed"
+	use tiff ||  myconf="--without-libtiff ${myconf}"
+	use gif ||  myconf="--without-libungif ${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() {
+	einstall || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}