Version bump.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

3 files changed, 61 insertions, 4 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index bd2fe38c6eeb..c376ae00053f 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.193 2008/08/19 08:15:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.194 2008/08/21 15:28:57 vapier Exp $
+
+*libpng-1.2.31 (21 Aug 2008)
+
+  21 Aug 2008; Mike Frysinger <vapier@gentoo.org> +libpng-1.2.31.ebuild:
+  Version bump.
 
 *libpng-1.2.31_rc01 (19 Aug 2008)
 
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 6bd52edf4f7e..2ccbb8fa2140 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libpng-1.2.24-pngconf-setjmp.patch 395 RMD160 149318b2941f0bee3c6de5075cad6725cbc34486 SHA1 19529489561af86a4c5ac6c6ed0246a7f2f09dd8 SHA256 7930a95a0f29b1c7afca8e11f4008341ad2cd30703ca67166416e0c24ebe198a
 AUX libpng-1.2.26-CVE-2008-1382.patch 7815 RMD160 e1aeff5aa392d376bfda21b1e94f918a2aff31d6 SHA1 a62c914bb75ba5921cec1511ffa7a033cfbdedfe SHA256 fbd1cb3e0812ba4fed90e3b06aee98109e98b7048ebed8f7086b8ee54807bfcb
 DIST libpng-1.2.26.tar.lzma 500072 RMD160 d9c733cb2354e9bb6d5e7145d91581c4acbeb1ca SHA1 6422456bcf8ed99c9acc0439f0a6738ad3b63b44 SHA256 6ac3c121ae5f5f76c14a50cf4aff68a4b51f1bda976eae1d706cbc4fda7173e1
 DIST libpng-1.2.27.tar.lzma 532395 RMD160 a94082ae3c7c946ae5b33df01c2bf31230391456 SHA1 25d22f130db49364f94a8982d2684a99cc3032cc SHA256 223dd505d4b24f7e91114b7538d39b66b35cb33f510593b637a67fd143255756
-DIST libpng-1.2.31rc01.tar.lzma 513150 RMD160 a8eb396adce1e95af8fd3ccaee5dddda1e1a4156 SHA1 42423f9c56e90d9170ec63e46a0fedd6cb557849 SHA256 dffbec567c3ed1bcc8dbfddce778175f559bddb992a44abfa73fd7078762ef2c
+DIST libpng-1.2.31.tar.lzma 513498 RMD160 4761e6482b5a8209854c5c95ab61fb4523a8637c SHA1 f372478860f5209ff328f1f15399267e001f97c3 SHA256 efa62f30c9e4dd983cf056acd75d672592752c7030ead3d619a5c2677292e361
 EBUILD libpng-1.2.26-r1.ebuild 1120 RMD160 09f57d85b1c38d2c9977183e8c7727f74e6aaa76 SHA1 9dd1e6412741a9c56017b8324946f180da4389f6 SHA256 4aea61ad04ff737f2831cedfb753222aa50ef5ea1e8d2343ed397857f59613eb
 EBUILD libpng-1.2.27.ebuild 1176 RMD160 32bb9ed21d8e4f30d05d66f856d04fb241d16c24 SHA1 6c02af15df0b5df0b22f927ee2f3493fc70dff84 SHA256 04039376c81dce4e6a1113fcf2ec44ed14fc97a12bb36bcce6e62226f9d81d20
-EBUILD libpng-1.2.31_rc01.ebuild 1130 RMD160 858f475f9220cf3475a756a5a5518117bf05a416 SHA1 af0aa196dfd1daef2804478429367f015c835427 SHA256 4644b3b853d05ad82fb805ff764d04b27922b563ab2ac42e38d8b8fd8108f56d
-MISC ChangeLog 26617 RMD160 9903925f1211d714e689761151832278212f4303 SHA1 910151eec4763fa1481c4354f40319a7e9c63a00 SHA256 dfbce872b7dee45be9b2d8555d059e65b49f2d036b4892ef40af27f3ab1b6c0e
+EBUILD libpng-1.2.31.ebuild 1128 RMD160 7c4f69072f42d8a7f7038fc3fbfe67c78797b1d2 SHA1 661a8ca7016373bb3655901d35aea8812c27f6dc SHA256 42bedb91a4757abe671932a86d476a6735cf9725479aa061ab66d777d26dde16
+MISC ChangeLog 26740 RMD160 fa05165c16a6f5a905e452b1a4c782df495c3273 SHA1 686c934135e8a317cf9498753523a90d712f6fd9 SHA256 dc621d9cb9891a0c5d98725d4fc85966257af9616e0d68252db80e8e5404a4ce
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiticIACgkQ67wieSYcaxeOswCfeXqNuzLAlWVElu/dUPEg0PE/
+YRkAnjLNHafUBjPj8xHjaJWrX/WrRwww
+=T+jZ
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/libpng-1.2.31.ebuild b/media-libs/libpng/libpng-1.2.31.ebuild
new file mode 100644
index 000000000000..964045159d70
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.31.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.31.ebuild,v 1.1 2008/08/21 15:28:58 vapier Exp $
+
+inherit libtool multilib eutils
+
+MY_PV=${PV/_}
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/libpng/${PN}-${MY_PV}.tar.lzma"
+
+LICENSE="as-is"
+SLOT="1.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/lzma-utils"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.24-pngconf-setjmp.patch
+
+	# So we get sane .so versioning on FreeBSD
+	elibtoolize
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
+}
+
+pkg_postinst() {
+	# the libpng authors really screwed around between 1.2.1 and 1.2.3
+	if [[ -f ${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1 ]] ; then
+		rm -f "${ROOT}"/usr/$(get_libdir)/libpng.so.3.1.2.1
+	fi
+}