We cannot stabilize giflib 4.2.x yet (#512540)

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 82 insertions, 52 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 83a4c39843d6..5dfc26fd3826 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-dotnet/libgdiplus
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.147 2013/12/16 13:40:00 polynomial-c Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.148 2014/07/05 10:59:00 pacho Exp $
+
+*libgdiplus-2.10.9-r2 (05 Jul 2014)
+
+  05 Jul 2014; Pacho Ramos <pacho@gentoo.org> +libgdiplus-2.10.9-r2.ebuild,
+  -libgdiplus-2.10.ebuild, libgdiplus-2.10.9-r1.ebuild:
+  We cannot stabilize giflib 4.2.x yet (#512540)
 
   16 Dec 2013; Lars Wendler <polynomial-c@gentoo.org>
   libgdiplus-2.10.9-r1.ebuild, +files/libgdiplus-2.10.9-freetype251.patch:
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
index 415d09773349..c3b8fd6236f7 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild,v 1.4 2013/12/16 13:40:00 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild,v 1.5 2014/07/05 10:59:00 pacho Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	x11-libs/libXt
 	>=x11-libs/cairo-1.8.4[X]
 	media-libs/libexif
-	>=media-libs/giflib-4.2.3
+	>=media-libs/giflib-4.1.3
 	virtual/jpeg:0
 	media-libs/tiff:0
 	!cairo? ( >=x11-libs/pango-1.20 )"
@@ -35,7 +35,6 @@ RESTRICT="test"
 
 PATCHES=("${FILESDIR}/${P}-gold.patch"
 	"${FILESDIR}/${PN}-2.10.1-libpng15.patch"
-	"${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch"
 	"${FILESDIR}/${PN}-2.10.9-freetype251.patch")
 
 src_prepare() {
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild
new file mode 100644
index 000000000000..ca6af5d43c21
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild,v 1.1 2014/07/05 10:59:00 pacho Exp $
+
+EAPI="5"
+
+inherit base eutils mono flag-o-matic
+
+DESCRIPTION="Library for using System.Drawing with mono"
+HOMEPAGE="http://www.mono-project.com"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
+
+IUSE="cairo"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=media-libs/freetype-2.3.7
+	>=media-libs/fontconfig-2.6
+	>=media-libs/libpng-1.4:0
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXt
+	>=x11-libs/cairo-1.8.4[X]
+	media-libs/libexif
+	>=media-libs/giflib-4.2.3
+	virtual/jpeg:0
+	media-libs/tiff:0
+	!cairo? ( >=x11-libs/pango-1.20 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+PATCHES=("${FILESDIR}/${P}-gold.patch"
+	"${FILESDIR}/${PN}-2.10.1-libpng15.patch"
+	"${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch"
+	"${FILESDIR}/${PN}-2.10.9-freetype251.patch")
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e 's:ungif:gif:g' configure || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	econf 	--disable-dependency-tracking		\
+		--disable-static			\
+		--with-cairo=system			\
+		$(use !cairo && printf %s --with-pango)
+}
+
+src_compile() {
+	emake "$@"
+}
+
+src_install () {
+	emake -j1 DESTDIR="${D}" "$@" install #nowarn
+	mono_multilib_comply
+	local commondoc=( AUTHORS ChangeLog README TODO )
+	for docfile in "${commondoc[@]}"
+	do
+		[[ -e "${docfile}" ]] && dodoc "${docfile}"
+	done
+	if [[ "${DOCS[@]}" ]]
+	then
+		dodoc "${DOCS[@]}"
+	fi
+	prune_libtool_files
+}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild
deleted file mode 100644
index 4256498f6226..000000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild,v 1.7 2013/08/27 15:59:50 kensington Exp $
-
-EAPI=2
-
-inherit eutils go-mono mono flag-o-matic
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cairo"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-		>=media-libs/freetype-2.3.7
-		>=media-libs/fontconfig-2.6
-		>=media-libs/libpng-1.4:0
-		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
-		virtual/jpeg:0
-		media-libs/tiff:0
-		!cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-2.10.1-libpng15.patch" )
-
-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 !cairo && printf %s --with-pango)	\
-				|| die "configure failed"
-}