old

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

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index b0a84904fd8aa653e0aaa25c09b7aa586e27d428..e4bc815e5df0d458f7db9633e60d46fd50c55c64 100644 (file)
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.314 2011/10/14 11:54:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.315 2011/10/14 11:55:57 ssuominen Exp $
+
+  14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -libpng-1.2.45.ebuild,
+  -files/libpng-1.2.45-build.patch, -libpng-1.4.8.ebuild,
+  -files/libpng-1.4.8-build.patch, -libpng-1.5.4-r1.ebuild,
+  -files/libpng-1.5.4-CVE-2011-3328.patch:
+  old
 
   14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> libpng-1.4.8-r1.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #384285

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 5ef5d3ab6a1f5ce54c316c58792938487dc3673a..4363e2942c6ff9a5198b26e08e459fe038b094bd 100644 (file)
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,35 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libpng-1.2.45-build.patch 384 RMD160 a6567731f964f8a78a2c2be44112761417e4799c SHA1 580afbf794330d33298b62fa84a3da1468c05c43 SHA256 980df151b1b785ab24b86b0e512340b7040c7ac02b58cc835170000b90cfdf7c
-AUX libpng-1.4.8-build.patch 272 RMD160 1f2a9395316c55637ae80207ef589422f2860a6d SHA1 3fb8182441b87f738c019ef2e8d8650042c71d32 SHA256 68342741c0bc08ee30abdbfb808e0c0065851ad5483a3982121ca8be8b7009e6
-AUX libpng-1.5.4-CVE-2011-3328.patch 912 RMD160 1424614deb663702a4018585099006524e947b5d SHA1 40230b3a020bd7c95bf8ae427e280577292d16ba SHA256 90d8ed6891e9c770112eb29b8edc4fddab1dfb880d7de6283156b1b8716bd505
-DIST libpng-1.2.45.tar.xz 539972 RMD160 c1294734d1912d84ac8dd2a53095d7345bd6ca99 SHA1 77d744bd5704c0218b8587014d0d205e4fe95cdf SHA256 befc6d2ddebae760f79bf9f88fecce42f88f2fc5962223da7bceb535cf2e5e9b
 DIST libpng-1.2.46.tar.xz 541808 RMD160 1ae035fb9bd06fa71adf736b1d4b6d152df0a3f6 SHA1 89fbe2bfb031d7c3ec65ee46041fe602c8f79f32 SHA256 f6f3ddc53bcb8cdd224f1d3642150df38aa5e8e9d509b0cedf793638c9269d65
-DIST libpng-1.4.7-apng.patch.gz 10437 RMD160 f0e2e8862f057fcc1be7ce26063fc58e58774720 SHA1 8286b869d0adabc77d25ca5fca3d4895b8b9618f SHA256 2e3db25f04cf3bdc193b04e431b8cca31d3d7d3616cee0bd7e58c0a46715e09d
 DIST libpng-1.4.8-apng.patch.gz 10437 RMD160 4c2c4b82a3b8b9d73d4e0c275f2f7caa2a8265c2 SHA1 67d5d8b388ff07f69984bf507abb5d6a4968071b SHA256 0d8cef7886863aebe412ba8f121347e6b4d886cf32677201d7294ae0e797b399
 DIST libpng-1.4.8.tar.xz 548124 RMD160 1197a6909d12a6fd5b621fe9fa22ff628da5dcb9 SHA1 3df18125f52254f0f996ff4ba6e61501590c2d35 SHA256 ad246b0d9df56bb0807d0e59e91d79c17ed78567a985d540956eb3d51ab76c46
-DIST libpng-1.5.4-apng.patch.gz 10394 RMD160 315a84875d46929da8dadc49b8811c2e6116a58f SHA1 09a184b2518f998d56663100e4e8b36c5320bf80 SHA256 22d9bac7c489c03da24c8db96bd86c60bcd63f58890c7ff7a7db90e46d87bec6
-DIST libpng-1.5.4.tar.xz 669616 RMD160 27aff1b06f87cea4762d2835f2b133b910ebaacd SHA1 acf6626a7ea6ff89e30c9c9eeffe992ee1605447 SHA256 ffa9426069972125baea2038e9eab2d11e1610fe12fc26a0b2d17738e24785e7
 DIST libpng-1.5.5-apng.patch.gz 10398 RMD160 8c2d0cba26a68b9b5b55d433ad2360ef99184ea0 SHA1 30f1decba8e330414921606eaab256d8ecac26ff SHA256 bc898c21b016e552403193f376a4ffbe86e3b0d44d4aaccabb429516e134571c
 DIST libpng-1.5.5.tar.xz 685320 RMD160 907cf91cd794a48445feee8785d72e3d538c9898 SHA1 3583126fdd70a94f4c33c1b717f3ff4201d619af SHA256 51b78bccb719b6a5abcac23665cab27d908df4bb5836fa9fa233de9d61c73a0f
-EBUILD libpng-1.2.45.ebuild 1059 RMD160 0f5701f98553c83a1e943eb531ebda3c70fee145 SHA1 109cb715e228a403f58647437360008c120f7c78 SHA256 9e267fb3f0c27fe003163bee9dc5be49d50bcd9706c7d62a8b8eacbf952874ed
 EBUILD libpng-1.2.46.ebuild 994 RMD160 7eec4cf37b6bd66ce2df1421ace58c9acf519b51 SHA1 a968c7e5ded68e80725b82396818919043fce7e2 SHA256 c747ac67b4065b6d34d481441fb53e9ce28737464e0e384f2c6e26231f447947
 EBUILD libpng-1.4.8-r1.ebuild 1416 RMD160 33e13525cf36ef503908f336ad5302079b8467f4 SHA1 36ef33b44767bacbae6fa5658686f67cf3442902 SHA256 f79c270faac71d0423de4ac9c03acd44ec572cc77cf9bef42a9efdbbb17134d7
 EBUILD libpng-1.4.8-r2.ebuild 1369 RMD160 531f587ba91f30eb15135f613068aed99545600f SHA1 bc4b9405b9d7533dd7ece78f7e39542b61d2d6b0 SHA256 ec52f045d997fc9bfb1fa2fe3686489956395c6f079b9a815e2cec32fbf497d2
-EBUILD libpng-1.4.8.ebuild 1467 RMD160 023570d161ac3f93c09893c2292a605ec079418b SHA1 6e2808c79a8c2cebdafa56611c7236d9aa2c195c SHA256 8447d796a9d51d3ed14b91aad3b39d82c4ea1ce0b0d35f8b3fcb6ce2a7abf5c1
-EBUILD libpng-1.5.4-r1.ebuild 1463 RMD160 27b6c8dd18f3169fb359c3bec9b433693d67b5de SHA1 faa68726cc46b698db204b4120fe2e0d1ce37af9 SHA256 40a8a4cd20697bcc2fb08fb1248db7515841039d9bfdfd9307fbd34c2cb21be6
 EBUILD libpng-1.5.5.ebuild 1677 RMD160 07198a113c129d2432f70da2cf8e8b051bac435a SHA1 947d9c2908ba8e18669884838891416ce453ab5b SHA256 2c8cf67007da81db8de48af8c8cb04eaa5a519323120ae616506539c971ae585
-MISC ChangeLog 42223 RMD160 b97fcfdf3d2e791ef3e81996e4b3e1bfcbbb4383 SHA1 9f0cb576aa03e50e98d2ffaaae2fb8a1f551e359 SHA256 68c8c330e37192ecd7856c8cb79ff320ffcd3e51782e8b8c7a079ee9b2871bc5
+MISC ChangeLog 42468 RMD160 4c068d28b1add33f2ca400ea3e3a902a91094c15 SHA1 1f23721899c14a8f4352ef87f5d6473a953157c4 SHA256 e3ae45763448dda3436a3408a1bb17a6568f1ca72abee0349ba234c50ca97d29
 MISC metadata.xml 247 RMD160 61ce1843d85a1ab05dc7838ac15375b0fb4f35bd SHA1 0a4b634f99126e9ebc485ad949b41df5a11f2fb0 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOmCLcAAoJEEdUh39IaPFNdjcIAJjSeXuNCXOOnmpUnOCqL7Gh
-sO22NYX1/atJTM34eMQ4MeQaj5kIbnQilSwFwIQ2Jjw7kNjXD1AoeUuo7AqenFsw
-gJ1j1iJtUZyyBya9hRYEEtMELipp7IxeOVR0naWhLTealeEHbwrgbsH2uV385Izd
-/kZHx2br+gxvnPSBYh3HuhidBXjKCT9QyhctdkwYC/n7efJy1hnjEL8HCSHACSH/
-Uqtw0gprLH/uAjRzn8VvnsykG7136AsvkEo0B1s81+zpCprhL8vj0et8KkBJ6jxY
-OMyl5h9i0lPr2EkwUqdCqwAg/2yDXBHfaDiNnH7dhcvoiDGHZye4BuPxvLuXJtI=
-=oHlB
+iQEcBAEBAgAGBQJOmCNNAAoJEEdUh39IaPFN3BoH/0iNXd4WgmMRAbt1Dd5NL0km
+L3sVaGyjGSH51jRvC1eQ7Yyje5WKSLzbMg7HDQkymHISCdNy3y0QRb1tfH2rzCv7
+3BwhnvYVknHZMwI51gn6x8FccbTR07TmRuYsWOveTj/Rz78vnJNIV8T9jN3b0bMD
+braeBedkHDJNmyLeHmyhKKcGo7Vcb1v6N/9qopvTwV+cCGl2IhUmnGeCLUeJGk8A
+RHQz3go67AcIC61zFhq2YDET3OOBBgXUDZSy2mVE6aYVCKSjiUS3SBbC9LsWdhL3
+fUP6wA/zgUzXfHbmmkKHIRUF99IO2sfnb+OzfbkJUPovgJIRI1ZRMXOJKxH1x9M=
+=1NJN
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libpng/files/libpng-1.2.45-build.patch b/media-libs/libpng/files/libpng-1.2.45-build.patch
deleted file mode 100644 (file)
index df1a0af..0000000
--- a/media-libs/libpng/files/libpng-1.2.45-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am
-+++ Makefile.am
-@@ -102,7 +102,7 @@
- 
- libpng.sym: png.h pngconf.h
-       rm -f $@ $@.new
--      $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@
-+      $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h > $(srcdir)/$@
-       cat $(srcdir)/$@ | \
-               $(SED) -n -e \
-               's|^.*PNG_FUNCTION_EXPORT[      ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \

diff --git a/media-libs/libpng/files/libpng-1.4.8-build.patch b/media-libs/libpng/files/libpng-1.4.8-build.patch
deleted file mode 100644 (file)
index 5477c51..0000000
--- a/media-libs/libpng/files/libpng-1.4.8-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-This patch is only because we are using apng patch from 1.4.7 in 1.4.8
-
---- pngtest.c
-+++ pngtest.c
-@@ -33,6 +33,7 @@
- 
- #include "zlib.h"
- #include "png.h"
-+#include "pngpriv.h"
- 
- /* Copied from pngpriv.h but only used in error messages below. */
- #ifndef PNG_ZBUF_SIZE

diff --git a/media-libs/libpng/files/libpng-1.5.4-CVE-2011-3328.patch b/media-libs/libpng/files/libpng-1.5.4-CVE-2011-3328.patch
deleted file mode 100644 (file)
index bcfdc11..0000000
--- a/media-libs/libpng/files/libpng-1.5.4-CVE-2011-3328.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- pngrutil.c.orig    2011-09-23 20:20:43.974170436 +0200
-+++ pngrutil.c 2011-09-23 20:21:41.308119496 +0200
-@@ -1037,12 +1037,14 @@
-           */
-          png_uint_32 w = y_red + y_green + y_blue;
- 
--         png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)(((png_uint_32)y_red *
--            32768)/w);
--         png_ptr->rgb_to_gray_green_coeff = (png_uint_16)(((png_uint_32)y_green
--            * 32768)/w);
--         png_ptr->rgb_to_gray_blue_coeff  = (png_uint_16)(((png_uint_32)y_blue *
--            32768)/w);
-+         if (w != 0) {
-+            png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)(((png_uint_32)y_red *
-+               32768)/w);
-+            png_ptr->rgb_to_gray_green_coeff = (png_uint_16)(((png_uint_32)y_green
-+               * 32768)/w);
-+            png_ptr->rgb_to_gray_blue_coeff  = (png_uint_16)(((png_uint_32)y_blue *
-+               32768)/w);
-+         }
-       }
-    }
- #endif

diff --git a/media-libs/libpng/libpng-1.2.45.ebuild b/media-libs/libpng/libpng-1.2.45.ebuild
deleted file mode 100644 (file)
index 75c2ea8..0000000
--- a/media-libs/libpng/libpng-1.2.45.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.45.ebuild,v 1.4 2011/07/12 12:39:02 tomka Exp $
-
-# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
-
-EAPI=4
-
-inherit autotools eutils multilib libtool
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="as-is"
-SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-       !=media-libs/libpng-1.2*:0"
-DEPEND="${RDEPEND}
-       app-arch/xz-utils"
-
-pkg_setup() {
-       if [[ -e ${EROOT}/usr/$(get_libdir)/libpng12.so.0 ]] ; then
-               rm -f "${EROOT}"/usr/$(get_libdir)/libpng12.so.0
-       fi
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-build.patch
-       eautoreconf
-       elibtoolize
-}
-
-src_configure() {
-       econf --disable-static
-}
-
-src_compile() {
-       emake libpng12.la
-}
-
-src_install() {
-       newlib.so .libs/libpng12.so.0.* libpng12.so.0
-}

diff --git a/media-libs/libpng/libpng-1.4.8.ebuild b/media-libs/libpng/libpng-1.4.8.ebuild
deleted file mode 100644 (file)
index 80574b2..0000000
--- a/media-libs/libpng/libpng-1.4.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.8.ebuild,v 1.8 2011/07/16 15:56:29 armin76 Exp $
-
-EAPI=4
-
-inherit eutils libtool multilib
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-       apng? ( mirror://sourceforge/${PN}-apng/${PN}-master/${PV}/${PN}-1.4.7-apng.patch.gz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-       app-arch/xz-utils"
-
-src_prepare() {
-       if use apng; then
-               epatch "${WORKDIR}"/${PN}-1.4.7-apng.patch
-               epatch "${FILESDIR}"/${P}-build.patch
-       fi
-
-       elibtoolize
-}
-
-src_configure() {
-       econf $(use_enable static-libs static)
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       dodoc ANNOUNCE CHANGES README TODO libpng-*.txt
-
-       find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
-       has_version ${CATEGORY}/${PN}:1.2 && return 0
-       preserve_old_lib /usr/$(get_libdir)/libpng12$(get_libname 0)
-}
-
-pkg_postinst() {
-       has_version ${CATEGORY}/${PN}:1.2 && return 0
-       preserve_old_lib_notify /usr/$(get_libdir)/libpng12$(get_libname 0)
-}

diff --git a/media-libs/libpng/libpng-1.5.4-r1.ebuild b/media-libs/libpng/libpng-1.5.4-r1.ebuild
deleted file mode 100644 (file)
index 85c4a0a..0000000
--- a/media-libs/libpng/libpng-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.4-r1.ebuild,v 1.1 2011/09/23 18:25:09 xarthisius Exp $
-
-EAPI=4
-
-inherit eutils libtool multilib
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-       apng? ( mirror://sourceforge/${PN}-apng/${PN}-devel/${PV}/${P}-apng.patch.gz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-       app-arch/xz-utils"
-
-DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-CVE-2011-3328.patch
-       use apng && epatch "${WORKDIR}"/${P}-apng.patch
-       elibtoolize
-}
-
-src_configure() {
-       econf $(use_enable static-libs static)
-}
-
-src_install() {
-       default
-       find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
-       has_version ${CATEGORY}/${PN}:1.4 && return 0
-       preserve_old_lib /usr/$(get_libdir)/libpng14$(get_libname 14)
-}
-
-pkg_postinst() {
-       has_version ${CATEGORY}/${PN}:1.4 && return 0
-       preserve_old_lib_notify /usr/$(get_libdir)/libpng14$(get_libname 14)
-}