Seems the -libpng15.patch isn't entirely compatible with libpng14, apply workaround...

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

diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
index d1d5ea2b22aa2179d24279394525c714bcf9e310..6aa5c4004bf69b460f576916186a30d705c0873d 100644 (file)
--- a/media-gfx/enblend/ChangeLog
+++ b/media-gfx/enblend/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/enblend
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.45 2011/08/07 15:56:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.46 2011/08/12 15:46:37 ssuominen Exp $
+
+  12 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild:
+  Seems the -libpng15.patch isn't entirely compatible with libpng14, apply
+  workaround from bug #378677
 
   07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild,
   +files/enblend-4.0-libpng15.patch:

diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 6ecec17b91f1912dcdcb63094b32723676ba71ee..fd9c01ef9a6efba304b587444d795155216107ee 100644 (file)
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 AUX enblend-4.0-libpng14.patch 625 RMD160 3045da81a10c6b5dc87ebe33ba74c5f96d9b11c8 SHA1 84bdbcfb700659ef51774b88d54f753fae56e605 SHA256 814dcb17d2e4d9d246ddeb7d6f477a0dcfa388af73d7fe004d8eb42f044c47c4
 AUX enblend-4.0-libpng15.patch 9442 RMD160 44f4ada76162ffabff5a81988c1c282316ca2080 SHA1 71e961d90be842eafe9d473d8d70b04b29077036 SHA256 05350a8dd5810a2940d65975af4b121375bc49dcb09a9fc36111aaf8ada02a3b
 DIST enblend-enfuse-4.0.tar.gz 1047295 RMD160 2a9968f2060077f6408d86de2d0cf07258f13abb SHA1 6ae102e7d15529168bf8ec3077062fbc87d6712f SHA256 fe42f41dc35bf4abb2a33623976593788717fff66a6ff048b7f8a3cb70b113b2
-EBUILD enblend-4.0.ebuild 1922 RMD160 da7a924c169c39384a8bd3c2e4ec42bd06fa3298 SHA1 54f2c537841156396bf88a166e06a3b1a285c264 SHA256 e95fda292b62908e9e2c203bbd50cff360d275e185a7d1313c8029245e2ba3cd
-MISC ChangeLog 6037 RMD160 863822c41cd5106965e9d4624a39827edd73f47c SHA1 52bd071dd73d8ef1c73d9a43b99a2fb561d995f0 SHA256 bfbc7fae7e1df891a0cd8ed452be440d7d463323b43fd298109c4e41bd0f97c7
+EBUILD enblend-4.0.ebuild 2034 RMD160 82d6992158338b403c82c223740e93afb8b467b6 SHA1 7a340f992a8242b5d0401ab149076936055a4651 SHA256 09e1128f8644965419fd8ecb525d9c9b43115badc37f55ae9dfb4b9cb217fa88
+MISC ChangeLog 6217 RMD160 a19b49d2000bdd47f8a7051634591c7648ad76e0 SHA1 a773d5ec0212c999152a6532d1a8f0f88d7bcdc3 SHA256 70f74e9d3d56fb5ad8068b0b57dc6735223cfa8f4948b86ac6556d03ca1fb7de
 MISC metadata.xml 298 RMD160 56230140606e9654db65297324c309b3186b6983 SHA1 193c9e2a2264a47824431aaf9ca43ae225d2ad2c SHA256 5d3fcb04b17733010c038cd4b18d4fff78a7ca252ebf3610ecdf353f7dce76f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4+tNwACgkQXkR9YqOcLPGHJwD/ZCgjidLaPYGbVR/lkfOud8hS
-7AK3tK5/MuX3MOCQ9PYA/27KCLqDONc07jX6higVYUZWsGpZ9LdBPc4fH0hisuVL
-=F3GR
+iF4EAREIAAYFAk5FSr0ACgkQXkR9YqOcLPHKzgD/W7ISyvbG6tUmmNp27oQXcSIR
+fUExZtXsam4X+9TsC+IA/0v5AsgmPzzhsOLxQgRhRaEkCV6WT9UZuRJ5vEAXSGAa
+=88hN
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/enblend/enblend-4.0.ebuild b/media-gfx/enblend/enblend-4.0.ebuild
index a77f1b810d62e41125a1107be8c672e505b06660..2b21f3e592b068ae70df0a1f977e3e920dce52ee 100644 (file)
--- a/media-gfx/enblend/enblend-4.0.ebuild
+++ b/media-gfx/enblend/enblend-4.0.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/enblend/enblend-4.0.ebuild,v 1.9 2011/08/07 15:56:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.0.ebuild,v 1.10 2011/08/12 15:46:37 ssuominen Exp $
 
 EAPI=2
 
@@ -43,7 +43,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-libpng1{4,5}.patch
+       epatch "${FILESDIR}"/${P}-libpng14.patch
+
+       # 378677, temp workaround
+       has_version ">=media-libs/libpng-1.5" && epatch \
+               "${FILESDIR}"/${P}-libpng15.patch
 }
 
 src_configure() {