Backport libpng14 patch from 2.6 to 2.4.2 wrt #325953 by Dustin Polke.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 12 insertions, 19 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 1b96b97e7835..c61c375c5405 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.110 2010/05/04 19:11:34 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.111 2010/06/28 09:32:32 ssuominen Exp $
+
+  28 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  libgdiplus-2.4.2.ebuild:
+  Backport libpng14 patch from 2.6 to 2.4.2 wrt #325953 by Dustin Polke.
 
   04 May 2010; Dror Levin <spatz@gentoo.org> libgdiplus-2.6.4.ebuild:
   Drop libpng14 patch, fixed upstream.
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index cef24574fffc..9e631e0087e4 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 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
@@ -16,21 +13,10 @@ EBUILD libgdiplus-1.2.4.ebuild 1912 RMD160 826851bd30bef44d5de4553c1375c08392055
 EBUILD libgdiplus-1.2.6.ebuild 1835 RMD160 f84235aa5e641a9d8b7514eff56f8f642497da05 SHA1 0c2829a78689c62977d7bbf6c4fc20e6d666367d SHA256 ffb2dd40062608f1ebc3012a6f1ca359017a09cba0e537b90e93edb750385398
 EBUILD libgdiplus-2.0.9999.ebuild 1380 RMD160 c62e05ac856e55767f0ff175ac267d8c131977c5 SHA1 f781d3aa4d01df0c6bf1f0feb2f41fd48ad62040 SHA256 e2105b2bb5637d10387b30e138611d6723e65e937e0c0559299043eb1acefa72
 EBUILD libgdiplus-2.0.ebuild 1359 RMD160 1f71da0b2ca02c2e63a2627e5e9936b48b272fb0 SHA1 61a02d73f0d6798291517a08ab83485718095818 SHA256 39afcec679b68757a4a727a5ddc3afc4dc8a5e0600009d23df32d6878b51a63a
-EBUILD libgdiplus-2.4.2.ebuild 1096 RMD160 ec1c831c8af7869e964ad4dcd2b6c616ca82d435 SHA1 fe9275f242c878de9fd0957a86153d23af8135b5 SHA256 786e67e565e8dc98cefea68477d865e1eec806a718d1b161fe64ead054de7b23
+EBUILD libgdiplus-2.4.2.ebuild 1246 RMD160 5a238db54521fa2da751ac8daea34c778421296b SHA1 eae185526473a78dac3feeff22d0631c1e08c12e SHA256 768b62e992b5d9dad31e3beab4a9426f92698de8eef0e1b891cebb2920a195b1
 EBUILD libgdiplus-2.4.9999.ebuild 1279 RMD160 9595f4dc9a4369f24fe367949e5666cb58bbbda4 SHA1 457c0a9cf38941ef665a2dc4a34e35345a7c18dd SHA256 f548adfcc2ca0774819adc1eb561bfbdb9f5d7c473eb2d5efc49245215f349b8
 EBUILD libgdiplus-2.6.4.ebuild 1102 RMD160 04c7e397083c1d4b97ada1bbb9d2e69ad4a62382 SHA1 e176be1f5706c914fad649a5f8d238c9a1ce7c46 SHA256 0abe5347890be70273a84c21edc7f9e4f56cc59fb8dead6f49e2b9ddfb53f454
 EBUILD libgdiplus-2.6.ebuild 1246 RMD160 6444d6b34c2dcb634ce20be04e4b43a8dfe65c0f SHA1 87801d4d59dc34893e16a09a4cdb346371dff382 SHA256 017df7d015be36c30fbef2e9582fdf1e47a1c8561fa028e3497f6cc709467fc3
 EBUILD libgdiplus-9999.ebuild 1227 RMD160 9aeb03dbc80c28d9ba6c1b588eaa450623fabed2 SHA1 f611cbc4b0d7287fea5f4022ee07c9d336231a2f SHA256 e76a2e500117cdda76c37908179a8df80dc320d9e225704a2f4b2c91c6be6077
-MISC ChangeLog 17975 RMD160 c912053acb2ebd6972436e53e200b0d1d561196f SHA1 86e2778eab1b73d489a42645177c9c1f8507d7cd SHA256 5aa8d9ff4a288990d38a12e83d77cb9ef693dfe9ad075615ee9433de0ff38853
+MISC ChangeLog 18134 RMD160 54b2be95e0d9d8c043b20ae875db72035a0721b8 SHA1 d35dd5fd597f621b1a8a8043d65b692458ba9093 SHA256 0ad1f5950104b469e58bfee88e67e11060c4ca6f7d79b993e8ea9fda67637983
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQEcBAEBCgAGBQJL4HF8AAoJEAWF714uGAc6md0H/ihciYPOPeUYd95pSYLDMJQm
-LF9fKEUAROFfXEFAsm5ce/M+b5YwY1JZQGQ8+bRoO1AJlPfPVNXdC6i39sDZim12
-Bqym3iLxLvzb27xLfKQ3ytur22tLe9a8Buz2otNkZFY9W0Ms9glmuS7XGj28WB85
-DFGaOnbj/p0kaBhRypONQzxrOjzioVvGIWJUbnzpAdQovWEP7Q5wQ5bQY8sfgVeI
-e2kfX0T0peuMw5T8G0eMOINnuNVMciKCzOhcY+SRHSJ90vDcAteR6LwQpEJjjeUf
-UwOTkCelQmIU3xwTysuGGjXUjtE/sEOtDPpqyBkL6eZ11SXDptnbqkYyfX/l/tQ=
-=YOIk
------END PGP SIGNATURE-----
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild
index c88fa367a1a9..09c0dd4b17a7 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild,v 1.5 2010/03/30 11:50:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild,v 1.6 2010/06/28 09:32:32 ssuominen Exp $
 
 EAPI=2
 
-inherit go-mono mono flag-o-matic
+inherit eutils go-mono mono flag-o-matic
 
 DESCRIPTION="Library for using System.Drawing with mono"
 HOMEPAGE="http://www.go-mono.com/"
@@ -34,6 +34,9 @@ RESTRICT="test"
 src_prepare() {
 	go-mono_src_prepare
 	sed -i -e 's:ungif:gif:g' configure || die
+	sed -i -e 's:png13:png14:' cairo/configure || die
+	has_version ">=media-libs/libpng-1.4" && epatch \
+		"${FILESDIR}"/${PN}-2.6-libpng14.patch
 }
 
 src_configure() {