Add revision bumps that use the internal cairo, and remove the cairo dependancy. Prune some older versions.

(Portage version: 2.0.51.22-r1)

15 files changed, 34 insertions, 193 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 9cd63d402c54..334e838eba59 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,19 @@
 # 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.33 2005/06/03 14:51:32 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.34 2005/06/03 22:00:37 latexer Exp $
+
+*libgdiplus-1.1.7-r1 (03 Jun 2005)
+*libgdiplus-1.0.6-r3 (03 Jun 2005)
+*libgdiplus-1.0.5-r4 (03 Jun 2005)
+
+  03 Jun 2005; Peter Johanson <latexer@gentoo.org>
+  -libgdiplus-1.0.5-r1.ebuild, -libgdiplus-1.0.5-r2.ebuild,
+  +libgdiplus-1.0.5-r4.ebuild, -libgdiplus-1.0.6-r1.ebuild,
+  +libgdiplus-1.0.6-r3.ebuild, -libgdiplus-1.1.4.ebuild,
+  -libgdiplus-1.1.4-r1.ebuild, -libgdiplus-1.1.5.ebuild,
+  +libgdiplus-1.1.7-r1.ebuild:
+  Add revision bumps that use the internal cairo, and remove the cairo
+  dependancy. Prune some older versions.
 
   03 Jun 2005; Peter Johanson <latexer@gentoo.org> libgdiplus-1.1.7.ebuild:
   Re-add ~ppc at dholm's request, now that we have a working mono-1.1.x
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index a4f863754ced..ab673da8d146 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -10,6 +10,9 @@ MD5 eb6f146dd08eb735c580b0fbd9160b0e ChangeLog 5691
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 MD5 606acb6e7c0ef822f28f9fb67b50a28f libgdiplus-1.0.6.ebuild 1356
 MD5 ab7932b52c101596484f526b1e34fd7a libgdiplus-1.1.7.ebuild 1574
+MD5 21202744371943d5cada6e90d8be3722 libgdiplus-1.0.5-r4.ebuild 1541
+MD5 23b1fda9caa660dd955d8f595d1cec6d libgdiplus-1.0.6-r3.ebuild 1517
+MD5 8cd1e2f6f730bd319e3e99fd108135d9 libgdiplus-1.1.7-r1.ebuild 1562
 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
@@ -25,3 +28,6 @@ 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
 MD5 6624183a5cb7011c8be241f33ad17446 files/digest-libgdiplus-1.1.7 69
+MD5 6624183a5cb7011c8be241f33ad17446 files/digest-libgdiplus-1.1.7-r1 69
+MD5 e513a9ab6f55d63191841b053a9f1c4b files/digest-libgdiplus-1.0.6-r3 68
+MD5 dfc3fef3162bdae151dac1e1a730054e files/digest-libgdiplus-1.0.5-r4 68
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.5-r2 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.5-r2
deleted file mode 100644
index 790b23c000f1..000000000000
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8be62d51c4c49ebe2008d433df513474 libgdiplus-1.0.5.tar.gz 422173
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.5-r1 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.5-r4
index 790b23c000f1..790b23c000f1 100644
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.5-r1
+++ b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.5-r4
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.6-r1 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.6-r3
index 504620a3a121..504620a3a121 100644
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.6-r1
+++ b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.0.6-r3
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.4 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.4
deleted file mode 100644
index b9b534cff8da..000000000000
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca540a3d211ed88e641c6c927b9525ce libgdiplus-1.1.4.tar.gz 1314320
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.4-r1 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.4-r1
deleted file mode 100644
index b9b534cff8da..000000000000
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca540a3d211ed88e641c6c927b9525ce libgdiplus-1.1.4.tar.gz 1314320
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.5 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.5
deleted file mode 100644
index 223d962663b7..000000000000
--- a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 369ba22e934364dc6f0052e4a3f662fe libgdiplus-1.1.5.tar.gz 1316565
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.7-r1 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.7-r1
new file mode 100644
index 000000000000..254bc63235b2
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.7-r1
@@ -0,0 +1 @@
+MD5 458c2c4aec84ac1cccb15b6c31fa8f7a libgdiplus-1.1.7.tar.gz 1337078
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r1.ebuild
deleted file mode 100644
index 2525dc863cde..000000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.5-r1.ebuild,v 1.4 2005/04/29 01:59:30 latexer Exp $
-
-inherit libtool
-
-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
-		virtual/x11
-		>=x11-libs/cairo-0.1.23
-		tiff? ( media-libs/tiff )
-		gif? ( media-libs/libungif )
-		jpeg? ( media-libs/jpeg )
-		png? ( media-libs/libpng )"
-
-RDEPEND=">=dev-lang/mono-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# 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-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
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r4.ebuild
index b79d1883dec9..2b9c0d91563c 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r2.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r4.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.0.5-r2.ebuild,v 1.4 2005/05/12 02:29:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.0.5-r4.ebuild,v 1.1 2005/06/03 22:00:37 latexer Exp $
 
 inherit libtool eutils
 
@@ -31,6 +31,7 @@ src_unpack() {
 	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"
@@ -40,9 +41,9 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
+	local myconf="--with-cairo=installed --disable-glitz"
 	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-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.0.6-r3.ebuild
index e851288f777d..05b1d8d942c8 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.0.6-r1.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.0.6-r3.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.0.6-r1.ebuild,v 1.4 2005/05/12 02:29:45 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.0.6-r3.ebuild,v 1.1 2005/06/03 22:00:37 latexer Exp $
 
 inherit libtool eutils
 
@@ -18,9 +18,8 @@ IUSE="tiff gif jpeg png"
 
 DEPEND="sys-devel/libtool
 		virtual/x11
-		=x11-libs/cairo-0.3.0*
 		tiff? ( media-libs/tiff )
-		gif? ( media-libs/libungif )
+		gif? ( media-libs/giflib )
 		jpeg? ( media-libs/jpeg )
 		png? ( media-libs/libpng )"
 
@@ -32,6 +31,7 @@ src_unpack() {
 
 	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"
@@ -41,9 +41,9 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
+	local myconf="--with-cairo=included --disable-glitz"
 	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.1.4-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.4-r1.ebuild
deleted file mode 100644
index 59d9c016fa05..000000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.4 2005/05/19 08:48:57 dholm 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
-		virtual/x11
-		=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
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.4.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.4.ebuild
deleted file mode 100644
index 623d95fc6d40..000000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-1.1.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.ebuild,v 1.6 2005/05/19 08:48:57 dholm 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
-		virtual/x11
-		=x11-libs/cairo-0.3.0*
-		tiff? ( media-libs/tiff )
-		gif? ( media-libs/libungif )
-		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
-	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-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
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.5.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.7-r1.ebuild
index 29da9887adeb..c2031c93f0b4 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.1.5.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.1.7-r1.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.5.ebuild,v 1.5 2005/05/19 08:48:57 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.1.7-r1.ebuild,v 1.1 2005/06/03 22:00:37 latexer Exp $
 
 inherit libtool eutils
 
@@ -8,11 +8,11 @@ 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"
+SRC_URI="http://www.go-mono.com/sources/${PN}-${PV:0:3}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="~x86 -ppc ~amd64"
 
 IUSE="tiff gif jpeg png"
 
@@ -20,7 +20,6 @@ DEPEND="sys-devel/libtool
 		sys-devel/automake
 		sys-devel/autoconf
 		virtual/x11
-		=x11-libs/cairo-0.3.0*
 		tiff? ( media-libs/tiff )
 		gif? ( media-libs/giflib )
 		jpeg? ( media-libs/jpeg )
@@ -33,7 +32,6 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.1.4-included-cairo-fix.diff || die
 	epatch ${FILESDIR}/${PN}-1.1.4-giflib.diff || die
-	epatch ${FILESDIR}/${P}-nogif.diff || die
 	libtoolize --copy --force || die "libtoolize failed"
 	autoheader || die "autoheader failed"
 	aclocal || die "aclocal failed"
@@ -42,7 +40,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="--with-cairo=installed"
+	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}"