From 455797776a6967256d3db6dcd08c97a010470e52 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Wed, 16 Nov 2011 09:47:56 +0000 Subject: [PATCH] Corrected Slotting of media-libs/tiff and media-libs/libpng Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- media-libs/netpbm/ChangeLog | 5 ++++- media-libs/netpbm/Manifest | 14 +++++--------- media-libs/netpbm/netpbm-10.51.00-r2.ebuild | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 20c33c71140a..2df4e3ec4616 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.259 2011/10/23 19:53:21 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.260 2011/11/16 09:47:56 jlec Exp $ + + 16 Nov 2011; Justin Lecher netpbm-10.51.00-r2.ebuild: + Corrected Slotting of media-libs/tiff and media-libs/libpng 23 Oct 2011; Tim Harder -files/netpbm-10.35.0-pnmtopng-zlib.patch, -files/netpbm-10.35.0-xml2.patch, diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index 717551f09192..43a1d4f2582a 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -7,17 +7,13 @@ AUX netpbm-10.51.00-ppmtompeg-free.patch 1199 RMD160 3e3594fc27166423904ec56c0d1 AUX netpbm-10.51.00-underlinking.patch 657 RMD160 c95af06e30622d8eeab0138001357da44314a062 SHA1 ae55ffd420c4a3d9d1c2f6a3e255438c09535572 SHA256 f933003b9c50717d76abaf3272b9bef66b328629a8791144fd0038e692989b95 DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 RMD160 49ee4fe57f170ffc1fb5470440dc840f0fb5387e SHA1 a6f0c2e37a5cb051e3c9275918c7e5b34c396aa9 SHA256 260a5f0e9834e7e1aa5c2dcc292695aa43b5aa198af1cb33e5705f7cac10da7b DIST netpbm-10.51.00.tar.xz 1834148 RMD160 71593d33e102de72230fbc306165ecc67bbb4c4f SHA1 ae5f9393ebcc75b0914f40c93a837de98a0a71c8 SHA256 6d7bb30d1d0e7f6a23b55c6f03bbb20b539909ad84281dc944b1072656dc1d0e -EBUILD netpbm-10.51.00-r2.ebuild 4867 RMD160 be56d9a322dd4152c60d2d5ddf468576a617f152 SHA1 b77c63fbcef27f06b7730523dc5afee9eeed35bc SHA256 b33209607ed2b3a7af589588581a89ee966286d8e9501bcd6e6b109d489f2b00 -MISC ChangeLog 36224 RMD160 6a1d34b849cd90f275202482326760d041c5bb63 SHA1 4b2c6503f70d459fa258e9cee74e4f554155ebf5 SHA256 9a09a224361b7b15ae83ba16ce82f7fc518bafdf5639440def5651230026e2b4 +EBUILD netpbm-10.51.00-r2.ebuild 4868 RMD160 1b4f7226fde38ccc9a8f347268a7e9e55b0835e4 SHA1 e897adebc96794d3f17973585df8c5dac28cfd28 SHA256 fc999b9493878d29aae528c049721e73b939bb42f0854598b358a6d5aee0b328 +MISC ChangeLog 36356 RMD160 f0b621f4bbe1f1812f9b981e4f9ec86933262e07 SHA1 4cf84b42e0040c2333ec1055f480b80cea724f33 SHA256 7fec55bcb6354f44d419d85bc2fca8765a4d2d147511db6adbee12b0a233f944 MISC metadata.xml 261 RMD160 1d652dbebb408b61de2afc2d49c8356a8eebee4c SHA1 c977c691e58d2ecbf5222ecde5ba6bf9a86ad84c SHA256 e04079912e263782a8c0e4f115e49ff3694535ff2efef7b7fff85cf8d100102b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOpHC3AAoJEEqz6FtPBkyjvuIH/iIljqgdQJ0uiXpP+0+EOdOX -qrykNil2dXCokb2SpxIBB+09hREN9ynjSonOBBgCCYdA77/bSC3bQBCiYoRbm/US -pDlVErXE13bzfmC6yPQ9i4NjVggsMPPCr6UO+IIRKtI8GZ5I83k1QAxaAG7Kiof0 -j1djtqeFd84frrx9HPgGnJYSmgUTB5jOthoH/8fpay9AyoWhNbMXbEz2lYZoIMIg -8AIekIJ0dg3G5dB6bnfJhQSPQ+qXv7qbRHC4uOlRZqp+qBMvnPM4bcLwXS5fKASH -+WMQJWjvFBDlje7gqaoL7QAXbmTRDV5r+9ADMaAqEg55mjRWhD1FGADLEsp6nFo= -=TVGH +iEYEAREKAAYFAk7DhtEACgkQgAnW8HDreRbPJwCgz09H5eRHrUpJNh+Zw0f84S6J +WGUAmwdRE966tMfY3XWDeY/Ehp1IaWPz +=rbuY -----END PGP SIGNATURE----- diff --git a/media-libs/netpbm/netpbm-10.51.00-r2.ebuild b/media-libs/netpbm/netpbm-10.51.00-r2.ebuild index 9607eac4a26e..5c22bbd5ea18 100644 --- a/media-libs/netpbm/netpbm-10.51.00-r2.ebuild +++ b/media-libs/netpbm/netpbm-10.51.00-r2.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-libs/netpbm/netpbm-10.51.00-r2.ebuild,v 1.4 2011/10/23 16:07:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00-r2.ebuild,v 1.5 2011/11/16 09:47:56 jlec Exp $ EAPI="3" @@ -19,10 +19,10 @@ IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib" RDEPEND="jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) - png? ( >=media-libs/libpng-1.4 ) + png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) - tiff? ( >=media-libs/tiff-3.5.5 ) + tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )" -- 2.26.2