Bump, and fix modular X deps. See bug #109978.

(Portage version: 2.0.51.22-r2)

5 files changed, 96 insertions, 11 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 1f8f15f7bc67..cf3425c6dfeb 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.44 2005/10/15 22:09:12 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.45 2005/11/14 05:05:18 latexer Exp $
+
+*libgdiplus-1.1.10 (14 Nov 2005)
+
+  14 Nov 2005; Peter Johanson <latexer@gentoo.org>
+  libgdiplus-1.1.9.2.ebuild, +libgdiplus-1.1.10.ebuild:
+  Bump, and fix modular X deps. See bug #109978.
 
   15 Oct 2005; Peter Johanson <latexer@gentoo.org> libgdiplus-1.1.8.ebuild:
   Mark stable on x86.
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index bfbbb8d48b2c..c8effc5c8365 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -3,7 +3,8 @@ MD5 42e0f604354db4c951afd2370d26cfb2 ChangeLog 7735
 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 796798be9a1fdde97b90e82cd44fdd3b libgdiplus-1.1.9.2.ebuild 1691
+MD5 20c915d5cc1b8d4765616d8e3be4704c libgdiplus-1.1.9.2.ebuild 1809
+MD5 2828cdf93bc8c347445337e87b5ab375 libgdiplus-1.1.10.ebuild 1765
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 MD5 606acb6e7c0ef822f28f9fb67b50a28f libgdiplus-1.0.6.ebuild 1356
 MD5 ddb453b524ee81a3b0788c201419c649 libgdiplus-1.0.5-r4.ebuild 1541
@@ -15,10 +16,12 @@ MD5 485f5e7481393d8b20a49b29d1728fac files/libgdiplus-1.0.6-giflib.diff 2261
 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 3b3b17c59f34b72c15586d26002d767a files/digest-libgdiplus-1.1.10 70
 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 3b3b17c59f34b72c15586d26002d767a files/digest-libgdiplus-1.1.10-r1 70
 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
diff --git a/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.10 b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.10
new file mode 100644
index 000000000000..e78276b60916
--- /dev/null
+++ b/dev-dotnet/libgdiplus/files/digest-libgdiplus-1.1.10
@@ -0,0 +1 @@
+MD5 1c91d5df9bdff329d10dea378770f0ae libgdiplus-1.1.10.tar.gz 1253488
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.10.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.10.ebuild
new file mode 100644
index 000000000000..765738614c47
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.1.10.ebuild
@@ -0,0 +1,68 @@
+# 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 $
+
+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}
+	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
+}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.9.2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.9.2.ebuild
index d292b11da184..abda475ba34c 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.1.9.2.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.1.9.2.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.9.2.ebuild,v 1.1 2005/10/15 21:52:36 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.1.9.2.ebuild,v 1.2 2005/11/14 05:05:19 latexer Exp $
 
 inherit libtool eutils flag-o-matic toolchain-funcs
 
@@ -16,14 +16,21 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="tiff gif jpeg png"
 
-DEPEND="sys-devel/libtool
-		sys-devel/automake
-		sys-devel/autoconf
-		virtual/x11
-		tiff? ( media-libs/tiff )
-		gif? ( >=media-libs/giflib-4.1.3 )
-		jpeg? ( media-libs/jpeg )
-		png? ( media-libs/libpng )"
+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}