Bump to 2.2, bug 254929

(Portage version: 2.2_rc22/cvs/Linux 2.6.28 x86_64)

4 files changed, 56 insertions, 82 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 780e22a18c84..83a7cac6a0a6 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,12 @@
 # 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.89 2008/11/25 00:02:37 loki_val Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.90 2009/01/18 17:44:29 loki_val Exp $
+
+*libgdiplus-2.2 (18 Jan 2009)
+
+  18 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> -libgdiplus-1.9.ebuild,
+  +libgdiplus-2.2.ebuild:
+  Bump to 2.2, bug 254929.
 
   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
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.9.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.9.ebuild
deleted file mode 100644
index 0ab80d294719..000000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-1.9.ebuild
+++ /dev/null
@@ -1,80 +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.9.ebuild,v 1.3 2008/06/01 11:51:35 jurek 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
-		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"
-
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.2.5-imglibs.patch"
-
-	sed -i \
-		-e 's/FONTCONFIG-CONFIG/FONTCONFIG_CONFIG/' \
-		-e 's/FREETYPE-CONFIG/FREETYPE_CONFIG/' \
-		configure.in || die 'configure.in not found'
-	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          \
-		--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"
-
-	# 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-2.2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.2.ebuild
new file mode 100644
index 000000000000..fdc3d46037de
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.2.ebuild,v 1.1 2009/01/18 17:44:29 loki_val Exp $
+
+EAPI=2
+
+inherit go-mono mono flag-o-matic
+
+DESCRIPTION="Library for using System.Drawing with mono"
+HOMEPAGE="http://www.go-mono.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="pango"
+
+RDEPEND=">=dev-libs/glib-2.16
+		>=media-libs/freetype-2.3.7
+		>=media-libs/fontconfig-2.6
+		media-libs/libpng
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXt
+		>=x11-libs/cairo-1.8.4[X]
+		media-libs/libexif
+		>=media-libs/giflib-4.1.3
+		media-libs/jpeg
+		media-libs/tiff
+		pango? ( >=x11-libs/pango-1.20 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	go-mono_src_prepare
+	sed -i -e 's:ungif:gif:g' configure || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	go-mono_src_configure	--with-cairo=system			\
+				$(use pango && printf %s --with-pango)	\
+				|| die "configure failed"
+}
+
diff --git a/dev-dotnet/libgdiplus/metadata.xml b/dev-dotnet/libgdiplus/metadata.xml
index e01adbb307db..8d51049a4d8f 100644
--- a/dev-dotnet/libgdiplus/metadata.xml
+++ b/dev-dotnet/libgdiplus/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>dotnet</herd>
+	<use>
+		<flag name='pango'>Use pango instead of cairo to render text.</flag>
+	</use>
 </pkgmetadata>