ppc stable wrt #386001

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

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 1f832ddfea3922ef7edf16b338cbd25de6fe3f0b..9fee9e6617b7154321c73c1c8a7f6d05b05fa23b 100644 (file)
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,9 @@
 # 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.66 2011/10/08 16:53:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.67 2011/10/10 17:25:15 ssuominen Exp $
+
+  10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> optipng-0.6.5.ebuild:
+  ppc stable wrt #386001
 
   08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> optipng-0.6.5.ebuild:
   amd64 stable wrt #386001

diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index b78200851130700a3c4fd4df7f0d7b6cdfba2e1d..d552d6d9777010f1a5c4e640049b6502c1d5a86a 100644 (file)
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -7,17 +7,17 @@ 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 1477 RMD160 cad5ba41317af2800ecf260566c2983557fac07e SHA1 59268ebcd8ff80aa01c8428df5f1216fdf122700 SHA256 61178571891cea0f1c30cc56e08a1ba177b10ee092c2db204ddd2e99788f256f
-MISC ChangeLog 8534 RMD160 6fb30a085300a038f8d77a47ac98ab46cc9205dd SHA1 f67de111c7a108c291c631e4ac41a03a153187ab SHA256 c6780ad45c5230d6b9d9d5598c7be367b9d1bf921738ca9d7367c0fa9da6f2ee
+EBUILD optipng-0.6.5.ebuild 1543 RMD160 a1eba759e9e36279c6efb62109947722623f39e4 SHA1 dad120e5b8c6bae9d6fea5d9582abcab60bcbd6d SHA256 ba956b2f5f2f1508be39193d35c718636d59ca9d49d946383fbe9f512e8b7cf7
+MISC ChangeLog 8636 RMD160 93c2372b34e16678c56977d7e57de16a73363b0e SHA1 644bdbaa081a08afc6a54fb9363e9c8d715a6aff SHA256 7430dbb2738b263c8eebacb37150ea40eb7434575bf0736fc62e9e2f7ac50eff
 MISC metadata.xml 231 RMD160 ad93c2ddb6e0542a959f1560f6c741487f33f40e SHA1 3d8f32088573b62fe90c8f980459df4c16d07613 SHA256 ab1a34805f2f24e02bc4f78dca5c1c6a485c83104b928dbbad0f3d87f77783b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOkIAqAAoJEEdUh39IaPFNmSUH/2jpdrWEyUYfSu0cayVTQatU
-0Hu9SqsTWCTKctgtbd+rZKxvajzAW1YbqYBDHDhzoOLiVCmad2OEiOViiVQsNZEw
-vmo4J5Wc/W2vN+yMUVaBHCT5XmOQKGiLQfWvbI+3b9w70eMW+ZJXKZ96gp7cl+Fb
-YFVQXGkbkAWeL+nna6hHftHSP9nRrIDhu9+lo/IR+e+/b4C7vdyncp3kElzINhYc
-V0DRLjFuseLJlM6L6vNRBfTJD9chNvLLv9elSXt4ZOyNnYJ9BSFObuItC7x3ryQH
-oFVVCVBwk2kZ3CPudFN68x0A+gxPQErJAwhmmZQXtwzcrPqHhAhBzS3/UBTmIYM=
-=WCvx
+iQEcBAEBAgAGBQJOkyqOAAoJEEdUh39IaPFN8XUH/2GMJdpNkrfNGv015l/7qmSq
+yf1hQodS+YVzGLWTjWU0rM6FVU/LMIYGpJ6nMdliLJ4FkLbsTHqnQ0YFrcV6RKZF
+b8tkiRKgPaKnM9u09ny65abRsCU7Am38P+ILSTM96GeDAA/3ioo1IXkQnW7f0Qzg
+zQtjnr85IHozyx2K5IOZ/YJ35/Zi33pQAAuFet/lrSYis5jU1QJyhq+lYN3zdu3E
+PwxEVcW/3ORbd4DTliQPcSFm4lg5hYT+PMQS9IO94h++ZhfJMLX9mE7MQ+rRdBfV
+W3ZOh2TQy95eb+IV4BHj05SjT4LKq/cX07c4aJjhEEa5wo9z2U/CoHE8Uj0Y98E=
+=bckp
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/optipng/optipng-0.6.5.ebuild b/media-gfx/optipng/optipng-0.6.5.ebuild
index 0584be7dc6cda5dca335cffee22c4b5d0652f344..81389d58f6eb355e6121990b53e636fadb81291d 100644 (file)
--- 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.4 2011/10/08 16:53:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.6.5.ebuild,v 1.5 2011/10/10 17:25:15 ssuominen Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -11,10 +11,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=media-libs/libpng-1.4"
+RDEPEND=">=media-libs/libpng-1.4:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -25,11 +25,13 @@ src_prepare() {
                lib/pngxtern/scripts/gcc.mak.in \
                || die "sed failed"
 
+       # FIXME
        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
+               ewarn "Using internal copy of libpng, see bug 355739"
                rm -rf lib/zlib
        fi
 }