Use internal copy of libpng14 with system libpng15 wrt #355739 by Hanno Boeck. This is a temporary solution until upstream has migrated.

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

3 files changed, 23 insertions, 14 deletions

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index b06ac8bd818b..d561bad7cfbf 100644
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/optipng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.63 2011/08/02 15:10:47 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.64 2011/09/17 18:43:28 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> optipng-0.6.5.ebuild:
+  Use internal copy of libpng14 with system libpng15 wrt #355739 by Hanno
+  Boeck. This is a temporary solution until upstream has migrated.
 
 *optipng-0.6.5 (02 Aug 2011)
 
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index da7229a70e11..3f780df243be 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX optipng-0.6.5-libpng-1.4.8.patch 3257 RMD160 6b4cb26e1c96d1074b3ce4eb8a8f2d9d524267a6 SHA1 eae46c43ef1bbf9a25839273327cebdbcf7cb7fb SHA256 48306de1267095caa239fac5ed37925c894d9e64fa2a251bc2fd016e6f964f9b
 DIST optipng-0.6.3.tar.gz 1060571 RMD160 3ef55878defee86a57b8b0b268da1a7e9eca0d14 SHA1 eba6e3c940588b1d02abfabc407e5c759a3fdd8a SHA256 d11630955e2e72f07dd0aa1270f9d20caaef41796fdbfbbc1caad5b931fdf721
@@ -7,13 +7,13 @@ DIST optipng-0.6.4.tar.gz 1483806 RMD160 6b5248c3c6b744315e70e86b49d998fe6675987
 DIST optipng-0.6.5.tar.gz 1534271 RMD160 2b67ce48cba37e5c77ef13bdc285b37e919e2b01 SHA1 91525748a0bbd9bbfa8355529da7c17a408173e5 SHA256 2998e203941cdb95eb97587a44b02b3b765e85a7d62fe2df076b0123a7ba5b44
 EBUILD optipng-0.6.3.ebuild 1196 RMD160 9b0ff8b3155199bf24e73d8f2149614558bc93fc SHA1 2dd24d8c25b89c3b78827ed9825b8c48baff60b8 SHA256 2e3b69be983b5b551fc970ee07ba87cd754cfe924e1811833bee55107e379aa6
 EBUILD optipng-0.6.4.ebuild 1244 RMD160 99d9fff0680c13f9b0444c32b6b078db4e707f33 SHA1 21a44c2a17dd1d391ff7c326dccd81b7941560e8 SHA256 0797194c6d3f0ff153c1fb86bcbbd533b5f2fce58b0066ee3be6179e2dbb080b
-EBUILD optipng-0.6.5.ebuild 1323 RMD160 2ef5dd0061487036e7f7375e240a1e5b0cb72363 SHA1 327e2663de92fee8c6285c470869b7e952656bf5 SHA256 24890afae3df6bcf3adf9dd8c76faffc522147907bc7c13ce3f771a67e0c48bd
-MISC ChangeLog 8101 RMD160 9b66f169586700ff4a57b66fd6f9176a8f16c703 SHA1 c8ba9bb2961f550c9172a47808c433030518f791 SHA256 cba8b8dec60cb55ef784c6655e5e372d6cdddf5d50a0d85ca4bb43967a7051a0
+EBUILD optipng-0.6.5.ebuild 1479 RMD160 77a522513bed4674d6cac1cfa6ee3ebc25a71d47 SHA1 819dc6e5be32d14971ae4ee31d4a7540d375217e SHA256 7bd7dbb67a0537f222e1178ae31b686a312b3ad48581dc22eff0ecbefd6b09f4
+MISC ChangeLog 8323 RMD160 279417bf7afc235cd0b7adba9fd75e6de2fecd11 SHA1 c4fe12365d74c679144293b6b67aa2a47fb93bd6 SHA256 8201c50e54a713d7097342a60a10092db8928166d398e5f627da247487c3ebf2
 MISC metadata.xml 253 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 SHA1 b30245f00aae656e7a024b2ab4b8ad8e5549250f SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk44E3QACgkQsAvGakAaFgB/3QCginIG0uMsq6C7TMqSUTrsZ3vC
-qcAAoLkAnevWoC2g5G/VXcohlfdt7wYz
-=2Jm+
+iF4EAREIAAYFAk506owACgkQXkR9YqOcLPF+cgEAgGpC/T8dz9qXBC5CPF7VnoGT
+ycVfAoZ1ZPOICBh7F2kA/RgoIvrOE08zqdnrWmdvx5pTYCXTE5B8P4dsvBjmkPya
+=wXqX
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/optipng/optipng-0.6.5.ebuild b/media-gfx/optipng/optipng-0.6.5.ebuild
index fbb0fa635087..8323045d9774 100644
--- a/media-gfx/optipng/optipng-0.6.5.ebuild
+++ b/media-gfx/optipng/optipng-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.5.ebuild,v 1.1 2011/08/02 15:10:47 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.5.ebuild,v 1.2 2011/09/17 18:43:28 ssuominen Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-DEPEND="<media-libs/libpng-1.5"
+RDEPEND=">=media-libs/libpng-1.4"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	sed -i \
@@ -23,15 +24,19 @@ src_prepare() {
 		src/scripts/gcc.mak.in \
 		lib/pngxtern/scripts/gcc.mak.in \
 		|| die "sed failed"
-	cp lib/libpng/pngpriv.h src/ || die
-	rm -rf lib/{libpng,zlib}
 
-	epatch "${FILESDIR}"/${P}-libpng-1.4.8.patch
+	if has_version "<media-libs/libpng-1.5:0"; then
+		cp lib/libpng/pngpriv.h src/ || die
+		rm -rf lib/{libpng,zlib}
+		epatch "${FILESDIR}"/${P}-libpng-1.4.8.patch
+	else
+		rm -rf lib/zlib
+	fi
 }
 
 src_configure() {
 	./configure \
-		-with-system-libpng \
+		$(has_version "<media-libs/libpng-1.5:0" && echo -with-system-libpng) \
 		-with-system-zlib \
 		|| die "configure failed"
 }