Bump for mono-2, remove crufty slag.

(Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64)

5 files changed, 32 insertions, 221 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/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"
 }