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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 88 insertions, 69 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/Manifest b/dev-dotnet/libgdiplus/Manifest
index ba9c9b442cce..c3a6ac87aaa3 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -6,26 +6,15 @@ AUX libgdiplus-2.10.9-freetype251.patch 295 SHA256 4cb78acd3c1d6776928d3f827def2
 AUX libgdiplus-2.10.9-giflib-quantizebuffer.patch 12869 SHA256 84d08006e21b667fd668d921b0d8db88f46e46cbed97d88372e092cf196c8e99 SHA512 3ad5ebd2bf9ef980dd273df9b036284d2217cee9ba09dbb6fa9d5b54da132eab0460597a63c53947d7d3f16b1079284413139937cc58b4694b102d1061e776c9 WHIRLPOOL b385e193652af68934d9400262554f7c9a42018a5a34b2452b859a4f2ad50c663313456efecbe86ce34a0fa9e7e55d4df50c44c8224b0dddfe16807e6dc26215
 AUX libgdiplus-2.10.9-gold.patch 443 SHA256 e437641ab6d7d21afd3234b7d49b10ceb7e80c33e6a22e85d1a9679f5a2bdf9c SHA512 93434d106d165cf167332ac6b0fe800eecd39f752ade2c38817ac13bfd69170d3df7e504f2dc0099ef62adc1c05790925fc99e0613bd519bee2df7dec8984912 WHIRLPOOL 710bcc3d3bebb6aa833ddef6fdf5adcb9309b61f20f48f2e1f72caffa28bacc0d73503b30d3c9b5e0cffdeec4b0713e8eb4445c5973327f977f30c9aa42596aa
 DIST libgdiplus-2.10.9.tar.bz2 2074317 SHA256 6ddeb6c327bada7cb6e06d1a20714f526a0c69520dfd42c12ddd032c3c5d964e SHA512 7f1944795c7ede5fd92a6d7e8d7d6cf2ef3c154e656b83e769b417f8f7195dd975084afe3c3cd1dda1ecb2c1167f76c0b5714cd16d549ff056add09763c6b26c WHIRLPOOL 0930cb2ad191c34b7ebd073f687536663bcfe9a44ed3296cf81bc9d43cfc7ee39d8f60f9b9f83f89847164b7366e514ee945737be50b82257209507c3b6e9c5d
-DIST libgdiplus-2.10.tar.bz2 1962898 SHA256 2d9e0397ef5583ed855eaafcdac8cabbe1d58463ed1e4b545be6dde5b63712a4 SHA512 b1e4b14dffabbe395873733e636fba4265d1a20e4cb5d90ddb90417996bc90c9e3e6a41a03d9367f9de0de8f675d637e97bd2fb182b20776e897782b85df8d2b WHIRLPOOL 2862d6bf7872c88e0391ebc47ed99adc59a22b9ab48d41871c323ed49121ee30af6d74bc5e100683cb7a4018a22b3398a274c8c6dac20c73f650cc135d2acc2b
-EBUILD libgdiplus-2.10.9-r1.ebuild 1738 SHA256 c69e1e83e11f9f2a89bf04a0e4e6dd4fb5eaf8c3ced7938a49a724a3c6d1be2e SHA512 c3aeed3f6a20080686788982d2b3081a61bb373479631e2f9fec5cd9d5bb930510e5b667847bc3233041243a90c742bfbec18ab33ce949f93c6f39360925e922 WHIRLPOOL eef3d582d63362b1a5f4b341b0a45b574fb18cc5e2ff486a70dc32a0de528531aedbca3d563167d4b006eb0d9900a9d64c72aca5d5f4970b4b8c91502d833038
+EBUILD libgdiplus-2.10.9-r1.ebuild 1675 SHA256 da8c9d524ebcf262b52d6a68dabf486b718d9d8806a16793ec43e20424f0d00b SHA512 669c1d522ea63a9651814d290329c276b258546c294fe4dc2d0b7fe250d167eb06d21cfcee9c1fbde029539ebd4aeab54f3468101cb12a28db7f2d50afa89983 WHIRLPOOL ed888b5e3947165731c46b51a992a11def86ffe62da87354a80a04929fcef2f833fc119e28c39112e79382016c5c2bd0edde783f004ee3b438440a40b9d44aa4
+EBUILD libgdiplus-2.10.9-r2.ebuild 1731 SHA256 ac173aa2d4e7208e397e4feb89902a861076842fe7240a65a6b4684bbece8d6c SHA512 ae56cc2f53bbb89cad0235f943670ddd50f1d5cfa1842e899eb319984a11058fc5b141d685b65e0f036d41a85e41014126c5fbf86072324440bbc8ddb39742f6 WHIRLPOOL af9e647c9bcfb830baf5b0c104eaa047be5c4138e8fa1e39ce72d10c4bb08e63489a734e57fd60affa1daad06486970a7565c4eaa54d9329ab679a0932ae1dc5
 EBUILD libgdiplus-2.10.9.ebuild 1230 SHA256 086e01c8aeafca8ed04b07abadd438d0f8abb06fea4503d6220a6a6a31a93d54 SHA512 f6e192d9e4c89929ab3c580b9a31f83b7482664edc6b0377da0090e5767cb563a1822828b873cb1151336d75bf5682811c5809a4de780f88b486c12498b46d10 WHIRLPOOL 16f7443039a6f6613ff5b99a0640ff80cd86f8953ea6b2063138d498aa4471ff45bbf0c8c67b9faf9a5cef2496bdf61e78128d5400b0bd571e7e9494df4b7735
-EBUILD libgdiplus-2.10.ebuild 1178 SHA256 b908951d9b9a555d30a187366d592fda0f4f4fa445c2eef6a112cc70ca717d10 SHA512 30e15e500d42f9dd1c69918908d99b64e5295376376f0957e0b3b712e23b8d5ec57ecf5d19d9e6db56cb2a1019292b304650ba29cde462ad42e33aa0b1a9000a WHIRLPOOL 9ebf98c65b3ec81bd922e228c9c480afbc517c652d010e02eb6e4c9164597c9cec2df0bf2f393941bab6cdbf0cbeb934d08058f0bcea725526bf2bfbd79a036e
-MISC ChangeLog 23513 SHA256 a62574f41bc01775e8c23afcbfeab56669fd8b87df9d39ea1e93e84973ccb13d SHA512 ec4d494405b596a4035c7be2b4df6d0290766607cbea95c99c3a992a19622eef0a196cf74d79663e515ae104da72cb8ec81ce9928f507a6a21ee9fec925b7bb5 WHIRLPOOL 01535b3bc530b625f59301cc8b421c7578712cf269322d0630fd739c1246bb04dacec883ddf9aa9b0de415b3c122d04ce1ad2dd1c2b4434006ec8754e2b3960e
+MISC ChangeLog 23725 SHA256 f3dbfdd5310312fe626207daad5ac058e125b1010169f0a104b8960624dfa7a5 SHA512 b5eb84c54959c98c3ab4f02fe4115022f5318ef64c4c980e36e4face6546d8d7e02c580873b842c36f25bd68f95646f9c6b9aa3df021f90f71a82cd0f7080703 WHIRLPOOL 3294677a06b51d620ade36672e4276daac51645908e4a8a45cbfefe25ae077035556742c4eb040994e0daf897fc3d6e3714c40d0a58602e67eef58bff9401869
 MISC metadata.xml 160 SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687 SHA512 087fcbf85988f071b9ce3491d0b6e1a767758e970950ef4247759ef48bcc4335c973dcc53b69fd712ac7e9704614878506fa342ba09edcf1c067e9ee478f94d7 WHIRLPOOL 65533bc6b7e60c26732efd476ed2c3aa0938bbea25140b8402ab2e05f0ac34c7a6d838ed7af763b2ec0a34317fcd8baf814f7c7ea8718ca5901160083d9525b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSrwKxAAoJEPiazRVxLXTFhGgQAM/LgJqCO+qjZkvNr7aTVkgN
-jU7z7sxERkW4zKtuGPrBv1AN7Ls/zLxim4/l6FvMbO9GVmPpL2ijcvl1SKWRmr/A
-b2xAjQZlSrtqx/jAo04jKkxqS4cc+6fwJybS+kFH/ClMjGkLmZKh/Bx88mfG5Spx
-aP4qkMMrFj6VgNWCF3d7FikVq5khi9lsNhVldo0xtaj1aBlGgaGFpMi8JkClUpm9
-svndyogsPe4MOQ3JihJDBjaF5SD7rEi1ZQCMaTMT8dsnTRLvxk5IwOw3fy54GsEZ
-x8RoQz5dEbw7aVr2q5tRT/h8aTTOMqzb86Pg790Pf3mtw0IvWct9G4DTNbCdN/cE
-jkejQ4YH+iTv46NyPlX+8E0C/OUE902/501KczPu8IDPw0e2ihspI2XVcwWbygqU
-jKUv99WK8hUqF4X7SQAesLa9aVouVLm+IHsJQTD+5Dr0bBnyrPtoVLyGZcuWxKAo
-AIK0zVSMEYBmcubApyBg0ijbjDgOWAC/dBmWMNxhHbHXVz8308q2T5pjdrTti9c5
-Z7mUnyFxrXJcFTNebOMNwPKF8wpX/T5YZW38ko1IXN20h3Y4+ugD75ynWkClwc8C
-uNMRVcaUk8ZGp0Aaem2r4ktmEXbQnVp1RnTcgqGCfr3oGpWa77t/9hUGKVYFeA6N
-qOLUIBp47t/Rj8Q08IWs
-=nc/d
+iEYEAREIAAYFAlO32nUACgkQCaWpQKGI+9QZ0gCfQf3akUmKYpMgfXRnwMc3eNdM
+gAMAn1OBYeVfnObq0O9EluY3Wh8NtK48
+=ABYY
 -----END PGP SIGNATURE-----
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"
-}