Lots of revision bumps to go from libungif -> giflib (bug #85720), and remove one slightly older version.

Package-Manager: portage-2.0.51.19

10 files changed, 212 insertions, 14 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 96eb7774ed75..d087f938ddd2 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,17 @@
 # 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.25 2005/03/31 18:33:54 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.26 2005/04/07 23:52:19 latexer Exp $
+
+*libgdiplus-1.1.4-r1 (07 Apr 2005)
+*libgdiplus-1.0.6-r2 (07 Apr 2005)
+*libgdiplus-1.0.5-r3 (07 Apr 2005)
+
+  07 Apr 2005; Peter Johanson <latexer@gentoo.org>
+  +files/libgdiplus-1.0.6-giflib.diff, -libgdiplus-1.0.4-r1.ebuild,
+  +libgdiplus-1.0.5-r3.ebuild, +libgdiplus-1.0.6-r2.ebuild,
+  +libgdiplus-1.1.4-r1.ebuild:
+  Lots of revision bumps to go from libungif -> giflib (bug #85720), and
+  remove one slightly older version.
 
   31 Mar 2005; Peter Johanson <latexer@gentoo.org>
   +files/libgdiplus-1.1.5-nogif.diff, libgdiplus-1.1.5.ebuild:
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index 6ba935709af8..c3aae5c37177 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,20 +1,25 @@
 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 d0c034f51f0705541d47bebaa0140b47 libgdiplus-1.0.5-r3.ebuild 1489
+MD5 13dd4e6908ce2dd6732ad0bd536bddc2 libgdiplus-1.0.6-r2.ebuild 1491
 MD5 f71840af3f53a8af204543fc7dba77df libgdiplus-1.1.5.ebuild 1586
+MD5 73fcc1ce6e2da734aadc2740f34f117a libgdiplus-1.1.4-r1.ebuild 1493
 MD5 7a160a8763e6b52ffa74eda1ddcca08f libgdiplus-1.0.5-r2.ebuild 1424
-MD5 48b7a28d15af1aacae2aac2de347d3c9 ChangeLog 4196
+MD5 959df276b020fb50d8ce616a3c39a7c1 ChangeLog 4623
 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 5588de6bd956056e540361d2ca4cbbb5 files/libgdiplus-1.1.5-nogif.diff 432
+MD5 485f5e7481393d8b20a49b29d1728fac files/libgdiplus-1.0.6-giflib.diff 2261
 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
+MD5 dfc3fef3162bdae151dac1e1a730054e files/digest-libgdiplus-1.0.5-r3 68
 MD5 e513a9ab6f55d63191841b053a9f1c4b files/digest-libgdiplus-1.0.6-r1 68
+MD5 e513a9ab6f55d63191841b053a9f1c4b files/digest-libgdiplus-1.0.6-r2 68
+MD5 8c3dae5b0b5642de968450f13c111900 files/digest-libgdiplus-1.1.4-r1 69
 MD5 07efe1db5bae7a73722aac0e952b4e2f files/libgdiplus-1.1.4-included-cairo-fix.diff 1223
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.4-r1 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.4-r1
deleted file mode 100644
index 1daf679ef58b..000000000000
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5709d9f79a4481bd24a5fdf60352d7d3 libgdiplus-1.0.4.tar.gz 421684
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.5-r3 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.5-r3
new file mode 100644
index 000000000000..790b23c000f1
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.5-r3
@@ -0,0 +1 @@
+MD5 8be62d51c4c49ebe2008d433df513474 libgdiplus-1.0.5.tar.gz 422173
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.6-r2 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.6-r2
new file mode 100644
index 000000000000..504620a3a121
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.6-r2
@@ -0,0 +1 @@
+MD5 4c412bbe7d46ceda6429720bb637f146 libgdiplus-1.0.6.tar.gz 422171
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.4-r1 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.4-r1
new file mode 100644
index 000000000000..b9b534cff8da
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.4-r1
@@ -0,0 +1 @@
+MD5 ca540a3d211ed88e641c6c927b9525ce libgdiplus-1.1.4.tar.gz 1314320
diff --git a/dev-dotnet/libgdiplus/files/libgdiplus-1.0.6-giflib.diff b/dev-dotnet/libgdiplus/files/libgdiplus-1.0.6-giflib.diff
new file mode 100644
index 000000000000..eb8a790a00f4
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/libgdiplus-1.0.6-giflib.diff
@@ -0,0 +1,60 @@
+diff -aur libgdiplus-1.0.6-orig/configure.in libgdiplus-1.0.6/configure.in
+--- libgdiplus-1.0.6-orig/configure.in	2005-01-31 20:40:50.000000000 -0500
++++ libgdiplus-1.0.6/configure.in	2005-04-07 19:12:59.000000000 -0400
+@@ -115,7 +115,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])])
+ 
+@@ -172,17 +172,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
+@@ -246,7 +246,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 ""
+Only in libgdiplus-1.0.6: configure.in.orig
+diff -aur libgdiplus-1.0.6-orig/src/gifcodec.c libgdiplus-1.0.6/src/gifcodec.c
+--- libgdiplus-1.0.6-orig/src/gifcodec.c	2004-11-13 19:28:19.000000000 -0500
++++ libgdiplus-1.0.6/src/gifcodec.c	2005-04-07 19:12:59.000000000 -0400
+@@ -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.0.4-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r3.ebuild
index 243972c98286..0836d86a6d3c 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.0.4-r1.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r3.ebuild
@@ -1,8 +1,8 @@
 # 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.0.4-r1.ebuild,v 1.4 2005/03/15 00:47:43 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r3.ebuild,v 1.1 2005/04/07 23:52:19 latexer Exp $
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="Library for using System.Drawing with Mono"
 
@@ -12,12 +12,12 @@ SRC_URI="http://www.go-mono.com/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~x86 ~ppc"
 
 IUSE="tiff gif jpeg png"
 
 DEPEND="sys-devel/libtool
-		>=x11-libs/cairo-0.1.23
+		>=x11-libs/cairo-0.3.0
 		tiff? ( media-libs/tiff )
 		gif? ( media-libs/libungif )
 		jpeg? ( media-libs/jpeg )
@@ -29,18 +29,20 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	epatch ${FILESDIR}/${P}-cairo-0.3.0-compat.diff || die "epatch failed"
+	epatch ${FILESDIR}/${PN}-1.0.6-giflib.diff || die "epatch failed"
+
 	# See bug #55916
 	einfo "Fixing a libtool problem"
-	rm ltmain.sh
-	aclocal
-	autoconf
-	libtoolize --force --copy
+	aclocal || die "aclocal failed"
+	autoconf || die "autoconf failed"
+	libtoolize --force --copy || die "libtoolize failed"
 }
 
 src_compile() {
 	local myconf=""
 	use tiff ||  myconf="--without-libtiff ${myconf}"
-	use gif ||  myconf="--without-libungif ${myconf}"
+	use gif ||  myconf="--without-libgif ${myconf}"
 	use jpeg ||  myconf="--without-libjpeg ${myconf}"
 	use png ||  myconf="--without-libpng ${myconf}"
 
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.0.6-r2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.0.6-r2.ebuild
new file mode 100644
index 000000000000..5921bdf0a5f4
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.0.6-r2.ebuild
@@ -0,0 +1,60 @@
+# 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.0.6-r2.ebuild,v 1.1 2005/04/07 23:52:19 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
+		>=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.0.5-cairo-0.3.0-compat.diff \
+		|| die "epatch failed"
+	epatch ${FILESDIR}/${P}-giflib.diff || die "epatch failed"
+
+	# See bug #55916
+	einfo "Fixing a libtool problem"
+	aclocal || die "aclocal failed"
+	autoconf || die "autoconf failed"
+	libtoolize --force --copy || die "libtoolize failed"
+}
+
+src_compile() {
+	local myconf=""
+	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() {
+	einstall || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.4-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..f7e33860d62b
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.1.4-r1.ebuild
@@ -0,0 +1,58 @@
+# 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.4-r1.ebuild,v 1.1 2005/04/07 23:52:19 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}/${P}-included-cairo-fix.diff || die
+	epatch ${FILESDIR}/${P}-giflib.diff || die
+	libtoolize --copy --force || die "libtoolize 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-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() {
+	einstall || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}