Version bump and use released apng patchset.

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

4 files changed, 112 insertions, 8 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 3a3f931d7f4f..f2604ba693cf 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,13 @@
 # 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.288 2011/07/09 08:03:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.289 2011/07/09 16:37:12 ssuominen Exp $
+
+*libpng-1.5.4 (09 Jul 2011)
+*libpng-1.4.8-r1 (09 Jul 2011)
+
+  09 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> +libpng-1.4.8-r1.ebuild,
+  +libpng-1.5.4.ebuild:
+  Version bump and use released apng patchset.
 
   09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> libpng-1.2.44.ebuild,
   libpng-1.2.45.ebuild, libpng-1.4.8.ebuild:
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index c7e9b9fb7902..5edfdfc0922a 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -8,23 +8,26 @@ DIST libpng-1.2.45.tar.xz 539972 RMD160 c1294734d1912d84ac8dd2a53095d7345bd6ca99
 DIST libpng-1.4.5.tar.xz 545672 RMD160 d1ac4f99949e98ffe56dce1d199edba30285b573 SHA1 c31578e005090280203cb3a6080e44f38c3f1a51 SHA256 3e57b75d11a013918da3a7529ec0229d4a82d3b1acde5de13fa371b9c3ac4275
 DIST libpng-1.4.7-apng.patch.gz 10437 RMD160 f0e2e8862f057fcc1be7ce26063fc58e58774720 SHA1 8286b869d0adabc77d25ca5fca3d4895b8b9618f SHA256 2e3db25f04cf3bdc193b04e431b8cca31d3d7d3616cee0bd7e58c0a46715e09d
 DIST libpng-1.4.7.tar.xz 547660 RMD160 5bc7f8931fac08655f42890b6d5423762f2747a9 SHA1 49ed9977bf7450089d2c156db3d28f772a4c9a87 SHA256 326d226e987973a05be2ac8ab9edc6c69bf3b5ba6a7886fad55d6c38199e807f
+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.2-apng.patch.gz 10452 RMD160 c8c6f97028e7107cb71a34ae643ed796ad9bec84 SHA1 8dcb17d1946f09b499ef1097db4db6b112348973 SHA256 7396cf3efab8295930df480c24e91eaadc1222afd3f74ba0b83ca57009a84f04
 DIST libpng-1.5.2.tar.xz 636256 RMD160 5334e340825dc097692358660ca95d4bc6697ef2 SHA1 50243a46c4745b39e7fcda7a39f498f38e084ad6 SHA256 f2bb6be8202af630fc7615fe3ff529aeb45be6ceeb3ad459f94edbf4e01d1cae
+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
 EBUILD libpng-1.2.44.ebuild 1048 RMD160 6155311153113c5cf5a6c7b01cb0e2eed492a550 SHA1 34c4c07c81c94ae7333a2f8dd835ef75f09c153b SHA256 cc79e52605f75aea8c0f71894ed24bfc0b10128a0a8d4621b21c616035db4097
 EBUILD libpng-1.2.45.ebuild 1066 RMD160 5833761bc0124d73d61e889010d5787eb94888ec SHA1 e7493465b82b56a0be6487fc8ec5b16646e92ad2 SHA256 8cdc5137e93602761187fe0a046859965380f905fdf718a01d2dbbe09c9912a8
 EBUILD libpng-1.4.5.ebuild 1267 RMD160 81bff4266eaefe7ef0256d463cbd3e7bbbeca8c3 SHA1 d4a4ada9bbb14ba2f0782bbca63e61b190ec8f1e SHA256 157c80ab4bcd2097af02f8cc2b7f5c3d60ef2f0ff3b62e93363f49e3a8a86417
 EBUILD libpng-1.4.7.ebuild 1458 RMD160 b2807fc85c2e765a6ab26aac3b72eabd858845e1 SHA1 6e615aa59095d643cfb6021a44804fab103a629f SHA256 8c58d5a91c45bfeccad6595c4c7e07538fd8843326f0dcf69a599147f91aa716
+EBUILD libpng-1.4.8-r1.ebuild 1417 RMD160 b3503b6eade5506072a989307ad21bc231a4db66 SHA1 0e1d9ef1523ee0e92e3ac8fac317f3b7b2c49e8c SHA256 35e4b517cd6128d925d012abcf2ef51b06acc683eaa19d02067afd4edcf68ece
 EBUILD libpng-1.4.8.ebuild 1480 RMD160 910856b0ab974fc3ef051c0c6c6329c529ff38b6 SHA1 303b0806279744e9fbfca4249a2341cfb345356b SHA256 f68c2f31652a78ad81962d1ab09870532c24af524cbe3357da027fc17eb170bc
 EBUILD libpng-1.5.2.ebuild 1402 RMD160 add14a2a9a17a99ff9cad4a537ee15842e9e9687 SHA1 ca14b76e893d559618e4d01ecbb38a4ae0993433 SHA256 f941c4e6e0266e340d26db7922c9fcf0143496d6d64db8993fcd14885794e103
-MISC ChangeLog 38731 RMD160 bfa41221427de09ac2a8c01f934a04fec4df29d3 SHA1 2018fca29fb211c8764a500450c852d69b38c060 SHA256 27bb25411ec02a7345a933cd91d1b17108dbdd40d4d95888aa20178007c3cc23
+EBUILD libpng-1.5.4.ebuild 1402 RMD160 00a99ce1c59ba9a643f3c6593d75c5608cd2fef3 SHA1 35d3c6b4e47b42e7ffbb611c20fbf5b409a38b44 SHA256 a8ad4d6343cceb80567cd9ab333779092e10c243a3676c9c08625412f202025d
+MISC ChangeLog 38941 RMD160 7ba640f24d17dde3468c3bbf14f5af4923d6154b SHA1 97057297531ac3af7cc7f742ac677d864a68772f SHA256 abb456208dc412b8b2fe13af379caba2ccf5252a7575cd6c4c24cc0df8ffead6
 MISC metadata.xml 247 RMD160 61ce1843d85a1ab05dc7838ac15375b0fb4f35bd SHA1 0a4b634f99126e9ebc485ad949b41df5a11f2fb0 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4YC0AACgkQIiMqcbOVdxQzHAP9FShTm/GC3ZrRVdP4NL9C9eQA
-c+d+2ZV2KvcBUM1R7eD8KGVvJAIj2J+aaDz9L5u0qandOIINTf1uB7rkI/eYFyyR
-4I+sjpawrDnKtTSQykOIhvtuJgK83+U16e/JShUoiCl0lGfmBZoaqBl7PI5ycRRx
-pAEb0v4iGmCQ7spoqTQ=
-=JA4e
+iF4EAREIAAYFAk4Yg2cACgkQXkR9YqOcLPEZJQEAjUi9UISE6w/qtzkOdjzUwjEB
+PsJxBHn93n/2ycsRmzkA/3W6d+ciD4kWY5U1fmPpsWk/XIqBMPSYaf+xfMc8aXUv
+=c1oM
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/libpng-1.4.8-r1.ebuild b/media-libs/libpng/libpng-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..bd4f2128c877
--- /dev/null
+++ b/media-libs/libpng/libpng-1.4.8-r1.ebuild
@@ -0,0 +1,47 @@
+# 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-r1.ebuild,v 1.1 2011/07/09 16:37:12 ssuominen 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}/${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 ~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() {
+	use apng && epatch "${WORKDIR}"/${P}-apng.patch
+	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.ebuild b/media-libs/libpng/libpng-1.5.4.ebuild
new file mode 100644
index 000000000000..721dd6806b36
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.4.ebuild
@@ -0,0 +1,47 @@
+# 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.ebuild,v 1.1 2011/07/09 16:37:12 ssuominen 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 ~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() {
+	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 0)
+}
+
+pkg_postinst() {
+#	has_version ${CATEGORY}/${PN}:1.4 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/libpng14$(get_libname 0)
+}