Go eapi-2, we won't go stable any sooner anyway. Drop imglibs patch, since it was causing unnecessary trouble. Choice is not always good. This ebuild seems to be in shape for getting unmasked.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64

3 files changed, 24 insertions, 28 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 7c0c78480673..780e22a18c84 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.88 2008/11/19 22:35:29 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.89 2008/11/25 00:02:37 loki_val Exp $
+
+  24 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> libgdiplus-2.0.ebuild:
+  Go eapi-2, we won't go stable any sooner anyway. Drop imglibs patch, since
+  it was causing unnecessary trouble. Choice is not always good. This ebuild
+  seems to be in shape for getting unmasked.
 
 *libgdiplus-2.0 (19 Nov 2008)
 
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index c009e87e83f9..af717c47d33b 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -9,6 +9,6 @@ DIST libgdiplus-2.0.tar.bz2 1971529 RMD160 5279db7cc3be45cb0a3a79bc10b48172a6549
 EBUILD libgdiplus-1.2.4.ebuild 1912 RMD160 826851bd30bef44d5de4553c1375c08392055982 SHA1 4f2c6cd620b37cba07f29244ec4d45455f64689e SHA256 515b3802230299399af0cd2d95005156ed585a15267d167c0612b07f8011b42a
 EBUILD libgdiplus-1.2.6.ebuild 1835 RMD160 f84235aa5e641a9d8b7514eff56f8f642497da05 SHA1 0c2829a78689c62977d7bbf6c4fc20e6d666367d SHA256 ffb2dd40062608f1ebc3012a6f1ca359017a09cba0e537b90e93edb750385398
 EBUILD libgdiplus-1.9.ebuild 2114 RMD160 46cdfd37ef3c5d1fb35cbaf4711ed51daf2e12cc SHA1 99a34c42cd9a6ffb59ecbd553e6f3c06b4a33cc7 SHA256 528a343793f3534c4e994a020feda2525ce342cc564213d4c84e75b58fcd9b84
-EBUILD libgdiplus-2.0.ebuild 1775 RMD160 336a3e84bfae4ec1d0309d1b5f3aa186cec2db1d SHA1 b85cb45012485068d6935d302fa097f8f2588454 SHA256 779b60b3fb9b4b1bc6dfc0ba63c2b8016e417be8c1b777a9b9f82916f83aedc6
-MISC ChangeLog 14610 RMD160 61e357c9d6e9bd738264dbaa0ac6f99db7fa3b36 SHA1 63a4cd82647ae64641e85ce8add3c3ef765def0e SHA256 4b0d62e7a46f8898ffb2b56bae86fb4c0b068a11906e506d16716f978c73f408
+EBUILD libgdiplus-2.0.ebuild 1364 RMD160 86e21d1df48b857d297383e74d8ae05541aba40b SHA1 7acfd52572425dfce3cdf02fecb0755e6eb24ca9 SHA256 ff5b123788685ea68c11d9c54d8a0734d8e73e3be573eded8d603f6cf39877ac
+MISC ChangeLog 14886 RMD160 dda577dc62ff07539baa8d9a478bba768f7f5533 SHA1 94597e14d640e213cbb08d76c72651df71d815a2 SHA256 eed0350b6cb559c9804d8acf3c797f84ea6613000222d2df89a2e05818e7821f
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.0.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.0.ebuild
index 572e5b1c4d2c..6755beb4563f 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-2.0.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.0.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.0.ebuild,v 1.1 2008/11/19 22:35:29 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.0.ebuild,v 1.2 2008/11/25 00:02:37 loki_val Exp $
 
-inherit base eutils flag-o-matic toolchain-funcs
+EAPI=2
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library for using System.Drawing with mono"
 HOMEPAGE="http://www.go-mono.com/"
@@ -11,7 +13,7 @@ SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="exif gif jpeg tiff"
+IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.6
 		>=media-libs/freetype-2
@@ -20,26 +22,17 @@ RDEPEND=">=dev-libs/glib-2.6
 		x11-libs/libXrender
 		x11-libs/libX11
 		x11-libs/libXt
-		x11-libs/cairo
-		exif? ( media-libs/libexif )
-		gif? ( >=media-libs/giflib-4.1.3 )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )"
+		x11-libs/cairo[X]
+		media-libs/libexif
+		>=media-libs/giflib-4.1.3
+		media-libs/jpeg
+		media-libs/tiff"
 DEPEND="${RDEPEND}
 		>=dev-util/pkgconfig-0.19"
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.5-imglibs.patch" )
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		eerror "you need to compile x11-libs/cairo with X USE flag enabled"
-		die "missing X USE flag on x11-libs/cairo"
-	fi
-}
-
-src_compile() {
+src_configure() {
 	if [[ "$(gcc-major-version)" -gt "3" ]] || \
 	   ( [[ "$(gcc-major-version)" -eq "3" ]] && [[ "$(gcc-minor-version)" -gt "3" ]] )
 	then
@@ -47,14 +40,12 @@ src_compile() {
 	fi
 
 	# Disable glitz support as libgdiplus does not use it, and it causes errors
-	econf	--disable-glitz          \
-		--disable-dependency-tracking \
-		--with-cairo=system \
-		$(use_with exif libexif) \
-		$(use_with gif libgif)   \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) || die "configure failed"
+	econf	--disable-dependency-tracking	\
+		--with-cairo=system		\
+		|| die "configure failed"
+}
 
+src_compile() {
 	emake || die "compile failed"
 }