Error out in pkg_setup() with media-libs/libpng >= 1.5.

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

diff --git a/media-gfx/pngcrush/ChangeLog b/media-gfx/pngcrush/ChangeLog
index 1a0f01193f7255cec5da38eebc448bca653044b1..1aefa07d5440bd57234844a600b33e03c87f31f4 100644 (file)
--- a/media-gfx/pngcrush/ChangeLog
+++ b/media-gfx/pngcrush/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/pngcrush
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.61 2011/09/16 16:44:38 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/ChangeLog,v 1.62 2011/09/18 08:41:31 ssuominen Exp $
+
+  18 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> pngcrush-1.7.17.ebuild:
+  Error out in pkg_setup() with media-libs/libpng >= 1.5.
 
 *pngcrush-1.7.17 (16 Sep 2011)
 

diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index e8844eec7cb6c56ea36c1cb233abf2b993bcd056..97358641a57da81006d622e282a1f8e64d2c09d6 100644 (file)
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX Makefile 266 RMD160 e0de84c3254288cc52266e6f05656758f5102c62 SHA1 af142ea41bb37f5b4d82a9d38f9a613df57a6a2e SHA256 29a1424722da4229c2a224cf73504e6bb712ec74f092500bce78fd9e8513af45
 DIST pngcrush-1.7.10-nolib.tar.xz 47200 RMD160 4866713d78f4de340e0171fc914574c1bcf8e81f SHA1 abd0b1a97f7536011d317626cfb90d5e178fb85b SHA256 2563e1682b423784cbc990f0755c4e4536fde7b15b9eee30c1c4080c5ba51158
@@ -7,13 +7,13 @@ DIST pngcrush-1.7.16-nolib.tar.xz 47844 RMD160 cd30700be19472592e98fb5667d787bf9
 DIST pngcrush-1.7.17-nolib.tar.xz 48204 RMD160 b6513eb006ad30ff2d74440d0eefb5bcec11d617 SHA1 a865192b348fe958b3a2a4f4348566fc710e5e65 SHA256 4266c1db944fcf6766df0f9db1a3913d8859037bef0b0b9259c98bc800e50652
 EBUILD pngcrush-1.7.10.ebuild 803 RMD160 0007dfc6c49d244785c8dc81f4b100d5db124b81 SHA1 30f14c3f3e2348ec4a34bf18372d55371629bfb8 SHA256 87a1b2741302acc0ee46caa9651744b709c47dd466eab8a29211a4518c2844a4
 EBUILD pngcrush-1.7.16.ebuild 787 RMD160 aeeb9a54965c5785d806b3454087e5f512113d4c SHA1 8203970b42c337a1e8a72488a7644b33d5ab55bc SHA256 05090381613c546e0284ec3d54a33b985453d4f87d881e1e37f13907073c5bbd
-EBUILD pngcrush-1.7.17.ebuild 787 RMD160 1a2fc327a66e65c8d46d949b0052fd183ff69328 SHA1 1c32a2f0c58e3d3f1c44e6f68b5a7af4be58f380 SHA256 6fdc48d1b74fa16c2217630322c8f605700f270313056a95ca7ead403c014bf4
-MISC ChangeLog 7603 RMD160 80f05d53a59b8859d5cf60afc4e54cc4b8294451 SHA1 f6c01bcdc6cf67ed5222616aecdd8740e4cbc07d SHA256 7ffb38435d3b644ce7d053121c8449e689c3b17612167da0be8d17ecfb8dfcad
+EBUILD pngcrush-1.7.17.ebuild 960 RMD160 09a488841aebe1fee0807adefa3ecc612f8b8f80 SHA1 8cce14b81da9bf420e296b6ffe9b1c17ab640294 SHA256 f30b43ba7c7a40da384e319e176427fb37c9ce0aade5ab6752112a659ae1fecf
+MISC ChangeLog 7741 RMD160 f327fbdb266cbac55aaf94f12c608722ce00f038 SHA1 b95ccdb4a0e3bbfb916626ac887b87d03d0f82f3 SHA256 6a626cc27b00a6eab6579a55e42c43e155f5257384209db32ebeece0d5d3c96c
 MISC metadata.xml 250 RMD160 9b209d29905483028ae3bfe5ac853ce2eb7bb999 SHA1 7870f001797ffb84203b59b3f0d21f97b5d5106b SHA256 6978f4d84e651d6c2bcda7e03af55bdadadc56bd3a9ab04740fdf58a77d26f90
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5zgUIACgkQTVUdg23rv50hvQCfcw+iZ7IsmBdtO7NuyDGQv7Rd
-g2sAoJeHZrbWuGKZIVgOZJR567fuowAk
-=IyuV
+iF4EAREIAAYFAk51rvgACgkQXkR9YqOcLPFWqgEAiVbtUrH1BapBIDJYPNFregHB
+GkidelrKnDsSnOR1GRcBAIPuszITRKRm9ob+tLSFrxskACZp2m80k3fto1LdrTHe
+=Mttb
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/pngcrush/pngcrush-1.7.17.ebuild b/media-gfx/pngcrush/pngcrush-1.7.17.ebuild
index 7670a110d317e11bfcfff4b562895a2734cb2ca1..fae481708095f3feb6741fc076844a609cf99035 100644 (file)
--- a/media-gfx/pngcrush/pngcrush-1.7.17.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.7.17.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/pngcrush/pngcrush-1.7.17.ebuild,v 1.1 2011/09/16 16:44:39 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcrush/pngcrush-1.7.17.ebuild,v 1.2 2011/09/18 08:41:31 ssuominen Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -16,13 +16,21 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
-RDEPEND=">=media-libs/libpng-1.2.40
+RDEPEND=">=media-libs/libpng-1.4
        sys-libs/zlib"
 DEPEND="${RDEPEND}
        app-arch/xz-utils"
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+       if has_version ">=media-libs/libpng-1.5"; then
+               local msg="Sorry, but libpng 1.5 is not yet supported. See bug 356127"
+               eerror "${msg}"
+               die "${msg}"
+       fi
+}
+
 src_prepare() {
        cp -f "${FILESDIR}"/Makefile .
        tc-export CC