Force correct slot of libpng to prevent people from doing silly things

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

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 5ae3eb8e89ead8b38d872c90121ae16fb8232b3a..a5a26f26f5a87a88ad0bff7e31567a98285e4ed4 100644 (file)
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX netpbm-10.31-build.patch 1629 RMD160 4226692b199871b3bfb27a9e6fec97d8ac1a4bf6 SHA1 574bd4443c6dbd8a2508bc2d2e3096cfcc815710 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323
 AUX netpbm-10.35.0-pnmtopng-zlib.patch 412 RMD160 fbef74327c74badad288454090b79627e2fde0d6 SHA1 08fd7b8e17c0f272cf628582b22f9ecde0d35cc9 SHA256 577a6b5a49c8773ca29adb045132ee71034e3b6f4abf29ff92126adb1ba83a17
 AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 SHA1 ce767bd1a0fe861cc9d1a47fa0bb53b12b4a58cc SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847
@@ -19,13 +16,6 @@ EBUILD netpbm-10.35.71.ebuild 4357 RMD160 b314454ddf4c7d3a5dfbe59c4d6ace22a63013
 EBUILD netpbm-10.35.73.ebuild 4366 RMD160 6f33358bf43bc24e2faf46488ed334dc91766821 SHA1 2db292c001c4c04f42c9be4abe0ca143d48d40cd SHA256 6f81e2d6e5c7c18959255ba353cf01ade3a4ed7f47e80a565e61cdc510f737c4
 EBUILD netpbm-10.46.00-r1.ebuild 4424 RMD160 6db996e17abba307a10df72eaacdb578788e86d6 SHA1 82c5cb191af8a3e4694597905035287fac25e812 SHA256 dbdf3237971b26b2a5e5a9a832f3670972b6f3beff51b41fa27308dc83354c9c
 EBUILD netpbm-10.48.00-r1.ebuild 4339 RMD160 3c4708c48f06ca3c1dd2c49cd290bf1ae29b74a8 SHA1 8acaec1188fa0b25d793379a9582b9490decb3bc SHA256 eb17822e7b266d63831efc54a2972297f1b2da54309a4a9e81f52ec04df4028a
-EBUILD netpbm-10.49.00.ebuild 4326 RMD160 8ed03dc72ae156f7baacddabd335275d647585b0 SHA1 ca61a15501d9687d3e8de63d811dc8d838a2a80c SHA256 8aed9900dec423f3962df4a9d3b2d57b19498a96d1ac1c5b1cb26ee05190cb22
+EBUILD netpbm-10.49.00.ebuild 4335 RMD160 c77c74eba80592de3dafcf7ea6c46912f5b1972a SHA1 ee7bed67f030221f01108d9e05825c93c767d63c SHA256 2cf36caca3cbc8d851da52c55d8d73ea4831a2f288a4775a3a9e8c1aa1f17e2a
 MISC ChangeLog 32441 RMD160 7f71d013893157f5d3edcdb5cb95e3c956fa7325 SHA1 bdce9a8165822d8b6ef04cfef93d889f4fa0d798 SHA256 3bf45fc021418a78b1fd733760b6908bf6750ddc6bf0174e7ff9570bb6ad7e60
 MISC metadata.xml 266 RMD160 de6149ba44458a170c3f6f6d5c015a3b4e5fe3bd SHA1 bb0d212119622779ede27328c6df989b362deac3 SHA256 4db3c087a1641cf4b8ae3750db0fb27bf8ff9a4dcbe496d1c173a9f9c04df75d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAkulMgIACgkQTwhj9JtAlp45ZAEAohzWMZJB8knu5xT3pSgBpf+6
-33vgP5qtRmVpN64ocsUBAKHQZrktKN/ugzOHyCc/wLpZv+zPghK0Nvw7P8R/sBCj
-=bA/I
------END PGP SIGNATURE-----

diff --git a/media-libs/netpbm/netpbm-10.49.00.ebuild b/media-libs/netpbm/netpbm-10.49.00.ebuild
index fcc9368a127a7d67e30ed9633c64f183714bebe8..72d50491e26713f51cb37c5a2154c44e7f410067 100644 (file)
--- a/media-libs/netpbm/netpbm-10.49.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.49.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.49.00.ebuild,v 1.2 2010/03/20 20:37:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.49.00.ebuild,v 1.3 2010/05/15 16:41:25 ssuominen Exp $
 
 EAPI=1
 inherit toolchain-funcs eutils multilib
@@ -19,7 +19,7 @@ IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib"
 RDEPEND="jpeg? ( >=media-libs/jpeg-7:0 )
        jpeg2k? ( media-libs/jasper )
        tiff? ( >=media-libs/tiff-3.5.5 )
-       png? ( >=media-libs/libpng-1.2.1 )
+       png? ( >=media-libs/libpng-1.2.43-r2:0 )
        xml? ( dev-libs/libxml2 )
        zlib? ( sys-libs/zlib )
        svga? ( media-libs/svgalib )