Version bump.

Package-Manager: portage-2.1.4_rc9

5 files changed, 78 insertions, 18 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 9c036f45c42e..a61bf763aac1 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.172 2007/11/09 18:04:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.173 2007/12/14 18:50:06 vapier Exp $
+
+*libpng-1.2.24 (14 Dec 2007)
+
+  14 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/libpng-1.2.24-pngconf-setjmp.patch, +libpng-1.2.24.ebuild:
+  Version bump.
 
 *libpng-1.2.23 (09 Nov 2007)
 
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 2a5be48baf42..f8d083bc142f 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,9 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.2.7-gentoo.diff 464 RMD160 536439602f48539452c626fe80a3022640ff1277 SHA1 b1d022f3f56db3e7fc1888092087cbccb1fded8e SHA256 5e44bbb599b25c4909a7cfc8b3478847ebc6f10bfcc21e98e1609d83f4c1acc6
 MD5 3338fff0166374e14ae138e6a1f4cd21 files/1.2.7-gentoo.diff 464
 RMD160 536439602f48539452c626fe80a3022640ff1277 files/1.2.7-gentoo.diff 464
@@ -24,11 +21,16 @@ AUX libpng-1.2.22-locale-syms.patch 511 RMD160 b0705afadc0eb04ffd8bdce079856eae8
 MD5 bfff37e3f5722e9fc246b386f57d8336 files/libpng-1.2.22-locale-syms.patch 511
 RMD160 b0705afadc0eb04ffd8bdce079856eae812a5793 files/libpng-1.2.22-locale-syms.patch 511
 SHA256 b5fc89820c27e26c46b4550d031cc7032a3860ee0f9dfb7a9e39b0f6c31422e5 files/libpng-1.2.22-locale-syms.patch 511
+AUX libpng-1.2.24-pngconf-setjmp.patch 395 RMD160 149318b2941f0bee3c6de5075cad6725cbc34486 SHA1 19529489561af86a4c5ac6c6ed0246a7f2f09dd8 SHA256 7930a95a0f29b1c7afca8e11f4008341ad2cd30703ca67166416e0c24ebe198a
+MD5 9615d87498dba1e669d04dce97609450 files/libpng-1.2.24-pngconf-setjmp.patch 395
+RMD160 149318b2941f0bee3c6de5075cad6725cbc34486 files/libpng-1.2.24-pngconf-setjmp.patch 395
+SHA256 7930a95a0f29b1c7afca8e11f4008341ad2cd30703ca67166416e0c24ebe198a files/libpng-1.2.24-pngconf-setjmp.patch 395
 DIST libpng-1.2.18.tar.bz2 623690 RMD160 ea81056a896eb038fa5d7fde2b7fa626c1a2e31e SHA1 42156e45fa999b242dc63c261e9253ce0dd810ab SHA256 6fce62f9e67e951c38672bf520c062a2be742e893d240d150748a00c32f20c62
 DIST libpng-1.2.20.tar.bz2 613683 RMD160 0934f9f304756e011c4f0d73ad95506e8663ccee SHA1 3fc27faf224ea31a43771c214f2f903ea2e98b0d SHA256 f5e1037be2cb2a47a7f50181a42fac289a662e78d0ec4c68971f557d5451b8c2
 DIST libpng-1.2.21.tar.bz2 614352 RMD160 2738cb7cebe19184a0ffefe31c49e570b0791049 SHA1 b626caff87100c6c86979a120fcb938c6d513163 SHA256 3b4f186e5dd1e683178d58d45db16f4fd9203f6518037ff28b4505ec35246953
 DIST libpng-1.2.22.tar.bz2 614414 RMD160 382e0edce39f65765d8f348c1ef03f5922f4a85f SHA1 15134a21e606254ba0a9e37af510a975c00d7c36 SHA256 03b8104975dcc4edf97d1f9d0dfccb8ff9f6eec9d2a2f271a3ff8a7c7cd53d54
 DIST libpng-1.2.23.tar.bz2 614843 RMD160 594b334481ed52751b60dec4bf4906b88cbeb9a0 SHA1 a03e47700660c1ee8dbef0dd2817285a21794455 SHA256 87da54b8b03156d0ff6d4904e01f2afaf12c712f628f43c5f499704379c2b478
+DIST libpng-1.2.24.tar.bz2 615634 RMD160 944dfaba20ed6ed8a15f7a5ae45c811f0b055a57 SHA1 67ea40f216348cc1d9952e972899cd17d175ec6f SHA256 502bbf08f55dc5a3fed9740881930e3b98230004b9f09f6d14f01736d5c4a04d
 EBUILD libpng-1.2.18-r1.ebuild 1053 RMD160 46b19c9fe4eb836623ce3df6f01ac4514fb1c45d SHA1 40d7fc015b0e7fccc2c02652814e0013ab376afa SHA256 ffa53500661128515f7f64ae5ffa8937b8ced76e044d4833dc13e16a2f6e5ace
 MD5 f9db8165dc46fc441279f2c8910ed4f5 libpng-1.2.18-r1.ebuild 1053
 RMD160 46b19c9fe4eb836623ce3df6f01ac4514fb1c45d libpng-1.2.18-r1.ebuild 1053
@@ -53,10 +55,14 @@ EBUILD libpng-1.2.23.ebuild 1015 RMD160 fbbf186af0ba65e378cd383e1e01d34f17a400af
 MD5 4a5ea3d6ab038ee19cc6f13bd7c5a315 libpng-1.2.23.ebuild 1015
 RMD160 fbbf186af0ba65e378cd383e1e01d34f17a400af libpng-1.2.23.ebuild 1015
 SHA256 30cb8c9510035f148585b3bff5f50ba4bf0f53fdeec66ddabe75bb2a4e942488 libpng-1.2.23.ebuild 1015
-MISC ChangeLog 24081 RMD160 882768c61199448eecfdcb1c8e930e88bcf143f0 SHA1 efb8f2c4ce0de3475f89b1344ac00d68bbb99797 SHA256 a69689babf5e4a47e34d79eeb3a694c8e2fbcf2245b708d7d003c89e53200604
-MD5 1b93ba51498ad2e5c0f4c73b0c72af60 ChangeLog 24081
-RMD160 882768c61199448eecfdcb1c8e930e88bcf143f0 ChangeLog 24081
-SHA256 a69689babf5e4a47e34d79eeb3a694c8e2fbcf2245b708d7d003c89e53200604 ChangeLog 24081
+EBUILD libpng-1.2.24.ebuild 1031 RMD160 30decfc19100f9ea29b8a77476df673e76ec6ed3 SHA1 4af1b7bfcc2464f016ecd7bf2327b703da853da2 SHA256 f01c330e3b6d9995ffcd5d1caada3791dce1cd9e741578b914395547de36bbc5
+MD5 0da8026a09dbc7e78bed7b362669d97a libpng-1.2.24.ebuild 1031
+RMD160 30decfc19100f9ea29b8a77476df673e76ec6ed3 libpng-1.2.24.ebuild 1031
+SHA256 f01c330e3b6d9995ffcd5d1caada3791dce1cd9e741578b914395547de36bbc5 libpng-1.2.24.ebuild 1031
+MISC ChangeLog 24246 RMD160 e3015fe4bad04efcc3d29a284f8b0597b3454135 SHA1 94a96d9eaae56bd60b486ff44b921899ff1a808d SHA256 ae47c0e7f24932ed61adc2b9bcc79c7e3ac689c127f5255123b2f8a67b64d9ae
+MD5 b8701efd56eebf6e4f58cb0551153039 ChangeLog 24246
+RMD160 e3015fe4bad04efcc3d29a284f8b0597b3454135 ChangeLog 24246
+SHA256 ae47c0e7f24932ed61adc2b9bcc79c7e3ac689c127f5255123b2f8a67b64d9ae ChangeLog 24246
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -79,17 +85,13 @@ SHA256 7af76a6c516562ef3359c370a0c7354413f0fcdde9f23c6711e4af97117eb4c2 files/di
 MD5 8624c2d9fc293f33d27d6b8d1a09d788 files/digest-libpng-1.2.23 244
 RMD160 ea19d9262077b16d6f5311b4d38cb2b3fb8d4170 files/digest-libpng-1.2.23 244
 SHA256 27dfd741b869109226a6f1cb651eabf2b698361bac193e2055f4a2f0e6097473 files/digest-libpng-1.2.23 244
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHXxndp/wUKkr7RBoRArmtAJ9Gzdugg/5BrHQ2N85TRY7woDmnaACgy6JH
-xJfcYHwDlf1oneBVaHGKckQ=
-=ey8b
-- -----END PGP SIGNATURE-----
+MD5 63308745eda1055cf55f269852770ffc files/digest-libpng-1.2.24 244
+RMD160 7aa59009ccfaba7b47d87ca190a49725a1302d4c files/digest-libpng-1.2.24 244
+SHA256 e55afdd0dc8ab0ed9e191492b8a41bb7181435386762babed23d43bd12b4afe3 files/digest-libpng-1.2.24 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHXxrkp/wUKkr7RBoRAvYmAJ9fyRc5m5abiFdy4RIInhLR91ItVgCeLyzl
-gRzWuNE6pkbbQ1yO/WcZ7Bo=
-=rwFg
+iD8DBQFHYtBup/wUKkr7RBoRAlnXAJ4tNYskOEWNmV81NCyIxTN3wZrtbwCgmBx6
+G/BbluAt6kTuC5i1acYa8J0=
+=g3gX
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/files/digest-libpng-1.2.24 b/media-libs/libpng/files/digest-libpng-1.2.24
new file mode 100644
index 000000000000..2095104b61e4
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.2.24
@@ -0,0 +1,3 @@
+MD5 1e676c5cc7dfa4ef78affe8fb8f1011d libpng-1.2.24.tar.bz2 615634
+RMD160 944dfaba20ed6ed8a15f7a5ae45c811f0b055a57 libpng-1.2.24.tar.bz2 615634
+SHA256 502bbf08f55dc5a3fed9740881930e3b98230004b9f09f6d14f01736d5c4a04d libpng-1.2.24.tar.bz2 615634
diff --git a/media-libs/libpng/files/libpng-1.2.24-pngconf-setjmp.patch b/media-libs/libpng/files/libpng-1.2.24-pngconf-setjmp.patch
new file mode 100644
index 000000000000..42547277f679
--- /dev/null
+++ b/media-libs/libpng/files/libpng-1.2.24-pngconf-setjmp.patch
@@ -0,0 +1,13 @@
+--- libpng/pngconf.h
++++ libpng/pngconf.h
+@@ -323,8 +323,8 @@
+      /* If you encounter a compiler error here, see the explanation
+       * near the end of INSTALL.
+       */
+-         __pngconf.h__ already includes setjmp.h;
+-         __dont__ include it again.;
++#warning  __pngconf.h__ already includes setjmp.h;
++#warning  __dont__ include it again.;
+ #    endif
+ #  endif /* __linux__ */
+ 
diff --git a/media-libs/libpng/libpng-1.2.24.ebuild b/media-libs/libpng/libpng-1.2.24.ebuild
new file mode 100644
index 000000000000..9e64c55ff0be
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.24.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.24.ebuild,v 1.1 2007/12/14 18:50:06 vapier Exp $
+
+inherit libtool multilib eutils
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2"
+
+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=""
+
+DEPEND="sys-libs/zlib"
+
+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
+}