Bump for mono-2, remove crufty slag.

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

6 files changed, 35 insertions, 239 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 0ec2ae4ed550..7c0c78480673 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,14 @@
 # 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.87 2008/06/01 11:51:35 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.88 2008/11/19 22:35:29 loki_val Exp $
+
+*libgdiplus-2.0 (19 Nov 2008)
+
+  19 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -libgdiplus-1.2.2.ebuild, -libgdiplus-1.2.3.ebuild,
+  -libgdiplus-1.2.5.ebuild, -libgdiplus-1.2.5-r1.ebuild,
+  +libgdiplus-2.0.ebuild:
+  Bump for mono-2, remove crufty slag.
 
   01 Jun 2008; Jurek Bartuszek <jurek@gentoo.org> libgdiplus-1.9.ebuild:
   Added check whether x11-libs/cairo has been built with X USE flag enabled
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index 27caceb6c92b..c009e87e83f9 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,29 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libgdiplus-1.1.13-libungif-configure-fix.diff 528 RMD160 456f3711ef77ebe406e051894e8159f38b4ebe61 SHA1 c4057ebe35183b2b21584fe551fcd4e79c456dad SHA256 1db9e2b00356602233a227c378fff03e8e80e64f439e65262379b82c69a93a93
 AUX libgdiplus-1.2.4-cairo.patch 395 RMD160 145c58e3bbbd719011d62ea5df12b42b57fe52b4 SHA1 45733b28559a78b81dd6d5ff56b6e8f9cf9879e9 SHA256 2436ae7e5e6309f1a9de0c82edb3e782a8661b5a46453564231fa230f2bbb242
 AUX libgdiplus-1.2.5-imglibs.patch 5743 RMD160 0c42aaf53d7e46489cd203f3633a487bb8e1146f SHA1 29bebd9434a818abcefc64caa2cba69a5dff3b38 SHA256 3c54fdead42729e8c8b6f9103b413c51df4a29273aa5a7def505b4abc1613fed
 AUX libgdiplus-1.2.6-autotool-variables.patch 1025 RMD160 320f836ab095e8eb8c453fc568a141561746c81d SHA1 2bfba4793df7ba087a6b547275a5c8a816239d33 SHA256 c2d4123b50e514fbd4eaf2a2bf27646d92e7c5105156dffc8c2513b19d1998f5
-DIST libgdiplus-1.2.2.tar.gz 2968362 RMD160 403c73cda029fac34a16093ae3449697d26c0f77 SHA1 aa82bbe49a7251bb055a9a60e4583cd7720cefc0 SHA256 1f54922c9bc9386cb116ef872a346bfb26b9dc530060dada7bf39e00f72dc0ec
-DIST libgdiplus-1.2.3.tar.gz 2991934 RMD160 9569f98bc1b987ec8f45ec92ede2f88bf7a36ad7 SHA1 313a1031ecb19c017453f4fa9c44651b8c4ddeb5 SHA256 6278edb273ff79a4fb896adf818792537a2977095e73ac74f5b31d50dead9dfa
 DIST libgdiplus-1.2.4.tar.bz2 2848526 RMD160 90d17f78ba50256d71478c105bbba0a30b68ab3e SHA1 53498e13ba0756ff1cb8a0b6227044dbc6bb3603 SHA256 373af7c1cf80d765e25a843ee69fe50809defab25a3e3a6df8ef974a47cb1326
-DIST libgdiplus-1.2.5.tar.bz2 2942165 RMD160 84ecbb58edea5deb91b140e11461fb6fcf8b0f28 SHA1 871e71c59680e602716b41caaa13655d1d55d229 SHA256 28edc21bc49f3791438ea70b5de944c4118a6daa557425f3209102379042e926
 DIST libgdiplus-1.2.6.tar.bz2 2897855 RMD160 9eeb1f3859017e1b73d7b49d96cb103413a806b6 SHA1 57321ab24b9fe1f821e39e3cffdf8c16a2e9677b SHA256 5eb1a7a8d3b75c751eac6075239469059238082aee1963bc6a172b3073046cfe
 DIST libgdiplus-1.9.tar.bz2 2898771 RMD160 7d0f280365d0f5ae5b8d607cbe51921ea0c49b79 SHA1 36d7d8edd385544e53e8fba0da7236104373c712 SHA256 ca32b01263651d8ed11b4bcd7a7f9df9186f85b57682799bcf11a82a22e0a2d8
-EBUILD libgdiplus-1.2.2.ebuild 1691 RMD160 634949bf5700c2d9d07e624ec0cbf1e0a1286485 SHA1 ecd7fbcafbdeaca26a6123ed1229780300e1d2e7 SHA256 2572ae3196830c85a2a006cb4d98b40c1f63b8f44cd277e5b685b15288756586
-EBUILD libgdiplus-1.2.3.ebuild 1729 RMD160 258d106aeccc4ba1975768e48be5e99318e74ddd SHA1 7208ad7c3830dd100d585106f690aea1df3a9992 SHA256 bfb76e8b011ff104f2a9a7974a428a2039ad33753400c0c899547b0279ebf3d8
+DIST libgdiplus-2.0.tar.bz2 1971529 RMD160 5279db7cc3be45cb0a3a79bc10b48172a6549445 SHA1 3f4fc1cb2808932e946aa2bb049494fd87fdaa5d SHA256 0a308dc3a8d1a91f036502ed45b8debc3c6f838d86cf6e15430c6969ab4a33b1
 EBUILD libgdiplus-1.2.4.ebuild 1912 RMD160 826851bd30bef44d5de4553c1375c08392055982 SHA1 4f2c6cd620b37cba07f29244ec4d45455f64689e SHA256 515b3802230299399af0cd2d95005156ed585a15267d167c0612b07f8011b42a
-EBUILD libgdiplus-1.2.5-r1.ebuild 1773 RMD160 3c00ba27386532dd2e748714ca664f7d6ec0cbd6 SHA1 ea58b4fb2097a6d5cb22c8d80f85aebee7955136 SHA256 7ddf33b2d8ef54449689582811e2c215195f096a1c5f09c112ba97904354cd22
-EBUILD libgdiplus-1.2.5.ebuild 1729 RMD160 0a1d733cb02d72c88d93fddd92a382fe82532d5a SHA1 792cb2c0f1f87daf98740091ef7f7be3778972ea SHA256 762aab82f5d220aceedbe1afdbfb8f99a348c47dc261eb74d658da5d7e34f13f
 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
-MISC ChangeLog 14346 RMD160 eb8d58bbc7d9f0a19b2e2bf7b6c0cfa75a840086 SHA1 f108092b8330a3abca9bf998e6bbc5859ca0b843 SHA256 d4ba0bbeb79e2cbfd1b6590313a996849dbe22de494fae16fe9702eaa076a227
+EBUILD libgdiplus-2.0.ebuild 1775 RMD160 336a3e84bfae4ec1d0309d1b5f3aa186cec2db1d SHA1 b85cb45012485068d6935d302fa097f8f2588454 SHA256 779b60b3fb9b4b1bc6dfc0ba63c2b8016e417be8c1b777a9b9f82916f83aedc6
+MISC ChangeLog 14610 RMD160 61e357c9d6e9bd738264dbaa0ac6f99db7fa3b36 SHA1 63a4cd82647ae64641e85ce8add3c3ef765def0e SHA256 4b0d62e7a46f8898ffb2b56bae86fb4c0b068a11906e506d16716f978c73f408
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhCjVAACgkQyOePD61SuWJmAgCcDr2yyS/7FqVxnPqDdaQWCCgN
-+uwAnjw9iVd+WTS82L8DnivN5p8pqJ6Q
-=q4GZ
------END PGP SIGNATURE-----
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.2.2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.2.2.ebuild
deleted file mode 100644
index ea9d07804aed..000000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-1.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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-1.2.2.ebuild,v 1.7 2008/04/18 22:19:04 compnerd Exp $
-
-inherit eutils flag-o-matic toolchain-funcs autotools
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.go-mono.com/"
-SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="exif gif jpeg tiff"
-
-RDEPEND=">=dev-libs/glib-2.6
-		 >=media-libs/freetype-2
-		 >=media-libs/fontconfig-2
-		   media-libs/libpng
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXt
-		 exif? ( media-libs/libexif )
-		 gif? ( >=media-libs/giflib-4.1.3 )
-		 jpeg? ( media-libs/jpeg )
-		 tiff? ( media-libs/tiff )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.19"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.1.13-libungif-configure-fix.diff"
-
-	eautoreconf
-}
-
-src_compile() {
-	if [[ "$(gcc-major-version)" -gt "3" ]] || \
-	   ( [[ "$(gcc-major-version)" -eq "3" ]] && [[ "$(gcc-minor-version)" -gt "3" ]] )
-	then
-		append-flags -fno-inline-functions
-	fi
-
-	# Disable glitz support as libgdiplus does not use it, and it causes errors
-	econf --disable-glitz          \
-		  $(use_with exif libexif) \
-		  $(use_with gif libgif)   \
-		  $(use_with jpeg libjpeg) \
-		  $(use_with tiff libtiff) || die "configure failed"
-
-	# attribute((__stdcall__)) generates warnings on ppc
-	if use ppc ; then
-		sed -i -e 's:-Werror::g' src/Makefile
-	fi
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.2.3.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.2.3.ebuild
deleted file mode 100644
index 5ca221d8ea22..000000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-1.2.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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-1.2.3.ebuild,v 1.5 2008/04/18 22:19:04 compnerd Exp $
-
-inherit eutils flag-o-matic toolchain-funcs autotools
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.go-mono.com/"
-SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="exif gif jpeg tiff"
-
-RDEPEND=">=dev-libs/glib-2.6
-		 >=media-libs/freetype-2
-		 >=media-libs/fontconfig-2
-		   media-libs/libpng
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXt
-		 exif? ( media-libs/libexif )
-		 gif? ( >=media-libs/giflib-4.1.3 )
-		 jpeg? ( media-libs/jpeg )
-		 tiff? ( media-libs/tiff )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.19"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.1.13-libungif-configure-fix.diff"
-
-	eautoreconf
-}
-
-src_compile() {
-	if [[ "$(gcc-major-version)" -gt "3" ]] || \
-	   ( [[ "$(gcc-major-version)" -eq "3" ]] && [[ "$(gcc-minor-version)" -gt "3" ]] )
-	then
-		append-flags -fno-inline-functions
-	fi
-
-	# Disable glitz support as libgdiplus does not use it, and it causes errors
-	econf --disable-glitz          \
-		  $(use_with exif libexif) \
-		  $(use_with gif libgif)   \
-		  $(use_with jpeg libjpeg) \
-		  $(use_with tiff libtiff) || die "configure failed"
-
-	# attribute ((__stdcall__)) generates warnings on ppc
-	if use ppc ; then
-		sed -i -e 's:-Werror::g' src/Makefile
-	fi
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.2.5.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.2.5.ebuild
deleted file mode 100644
index 1ff65c6a7460..000000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-1.2.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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-1.2.5.ebuild,v 1.2 2008/04/18 22:19:04 compnerd Exp $
-
-inherit eutils flag-o-matic toolchain-funcs autotools
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.go-mono.com/"
-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"
-
-RDEPEND=">=dev-libs/glib-2.6
-		 >=media-libs/freetype-2
-		 >=media-libs/fontconfig-2
-		   media-libs/libpng
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXt
-		 exif? ( media-libs/libexif )
-		 gif? ( >=media-libs/giflib-4.1.3 )
-		 jpeg? ( media-libs/jpeg )
-		 tiff? ( media-libs/tiff )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.19"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.1.13-libungif-configure-fix.diff"
-	eautoreconf
-}
-
-src_compile() {
-	if [[ "$(gcc-major-version)" -gt "3" ]] || \
-	   ( [[ "$(gcc-major-version)" -eq "3" ]] && [[ "$(gcc-minor-version)" -gt "3" ]] )
-	then
-		append-flags -fno-inline-functions
-	fi
-
-	# Disable glitz support as libgdiplus does not use it, and it causes errors
-	econf --disable-glitz          \
-		  $(use_with exif libexif) \
-		  $(use_with gif libgif)   \
-		  $(use_with jpeg libjpeg) \
-		  $(use_with tiff libtiff) || die "configure failed"
-
-	# attribute ((__stdcall__)) generates warnings on ppc
-	if use ppc ; then
-		sed -i -e 's:-Werror::g' src/Makefile
-	fi
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.2.5-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.0.ebuild
index b35acd566963..572e5b1c4d2c 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.2.5-r1.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.0.ebuild
@@ -1,8 +1,8 @@
 # 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-1.2.5-r1.ebuild,v 1.2 2008/04/18 22:19:04 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.0.ebuild,v 1.1 2008/11/19 22:35:29 loki_val Exp $
 
-inherit eutils flag-o-matic toolchain-funcs autotools
+inherit base eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library for using System.Drawing with mono"
 HOMEPAGE="http://www.go-mono.com/"
@@ -14,28 +14,29 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="exif gif jpeg tiff"
 
 RDEPEND=">=dev-libs/glib-2.6
-		 >=media-libs/freetype-2
-		 >=media-libs/fontconfig-2
-		   media-libs/libpng
+		>=media-libs/freetype-2
+		>=media-libs/fontconfig-2
+		media-libs/libpng
 		x11-libs/libXrender
 		x11-libs/libX11
 		x11-libs/libXt
-		 exif? ( media-libs/libexif )
-		 gif? ( >=media-libs/giflib-4.1.3 )
-		 jpeg? ( media-libs/jpeg )
-		 tiff? ( media-libs/tiff )"
+		x11-libs/cairo
+		exif? ( media-libs/libexif )
+		gif? ( >=media-libs/giflib-4.1.3 )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )"
 DEPEND="${RDEPEND}
 		>=dev-util/pkgconfig-0.19"
 
 RESTRICT="test"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=( "${FILESDIR}/${PN}-1.2.5-imglibs.patch" )
 
-	epatch "${FILESDIR}/${PN}-1.1.13-libungif-configure-fix.diff"
-	epatch "${FILESDIR}/${P}-imglibs.patch"
-	eautoreconf
+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() {
@@ -46,16 +47,13 @@ src_compile() {
 	fi
 
 	# Disable glitz support as libgdiplus does not use it, and it causes errors
-	econf --disable-glitz          \
-		  $(use_with exif libexif) \
-		  $(use_with gif libgif)   \
-		  $(use_with jpeg libjpeg) \
-		  $(use_with tiff libtiff) || die "configure failed"
-
-	# attribute ((__stdcall__)) generates warnings on ppc
-	if use ppc ; then
-		sed -i -e 's:-Werror::g' src/Makefile
-	fi
+	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"
 
 	emake || die "compile failed"
 }