Added a fully blown 1.5.17 version as it's needed for stabilization of seamonkey-2.22 (see bug #489796). Moved the SLOT=1.5 ebuild to 1.5.17-r15

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 71 insertions, 12 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index f8c1a7cf153c..24e6f160010b 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.420 2013/10/01 14:55:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.421 2013/11/06 08:12:36 polynomial-c Exp $
+
+*libpng-1.5.17-r15 (06 Nov 2013)
+*libpng-1.5.17-r1 (06 Nov 2013)
+
+  06 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> -libpng-1.5.17.ebuild,
+  +libpng-1.5.17-r1.ebuild, +libpng-1.5.17-r15.ebuild:
+  Added a fully blown 1.5.17 version as it's needed for stabilization of
+  seamonkey-2.22 (see bug #489796). Moved the SLOT=1.5 ebuild to 1.5.17-r15.
 
   01 Oct 2013; Samuli Suominen <ssuominen@gentoo.org> libpng-1.6.6.ebuild:
   Use the 1.6.6 apng patchset since it's released for cosmetics (and SRC_URI wrt
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 1d52f18ab3f1..b6fc96c0c0aa 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -11,18 +11,25 @@ DIST libpng-1.6.6.tar.xz 870332 SHA256 0407965a0057af7a9e4cefe27c062f517d9ad701c
 EBUILD libpng-1.2.50-r1.ebuild 1110 SHA256 3a2de24521e59d0db2cab8ce2f647a5721c2076dd2362476ea97b9ca472f7728 SHA512 a5d7c5e126b59f8975c2ecb7a4a8a779c67b5ad348d8da1ef6b4790bb20a4d0c4e0ec91a3447168319c083bcd3ec0c13a99543c9e2c10bae88887936e4986ad6 WHIRLPOOL 1cbd13f7e1414855a6a231dc29c1c7e0f5d4fb283b75b9b629104ad75d4a5affbc9f2a3739da3036afe54711a57910d02d3a3977c8000da225d436f72af4460a
 EBUILD libpng-1.2.50.ebuild 881 SHA256 371168b4ea273ffd639aa71bb7b34c4d666c781969cf9b28e0f41f735bec5aa7 SHA512 4fad7a0852d44e0594495321fc1b7746702a48eaf4d1455ff6517158e934a12c5bb61b691fdc3df91291da9cc82e22154304102bf1ef11c4e9f93ffdaabb1c84 WHIRLPOOL eb7dc0101bc8df649c6e506d47642862626179797c10e874a17428bb6f2115bf3daf557521852eca0a40e417a714643c0441334f9612994c2468844510430c12
 EBUILD libpng-1.5.15.ebuild 1408 SHA256 4d9296bdd55075dbe861d1a82c154439d93ee2b78674ccce9c6a1279f836bf76 SHA512 ac4c6331f39ad2e27258235b7afda0404ef70d2d94d0f3aeec07c6437c62de2eec98c8e1fe5f4d5f6870c4afc7f7e7621d511999536d1f2ffdb778016a21f6cf WHIRLPOOL 654c9cf1e6e23911309cad192125312700e9a5a0d8ae013d57933a8ddfb392c06ce0be070bf3cc36cf728cce5aaa6ad768a71fe68bd29b1b632e50c9ca395690
-EBUILD libpng-1.5.17.ebuild 1509 SHA256 7cf872dc88bad9015d4ccd7570929c456e9ecb61e48679756eef2632450517dd SHA512 7e82c45faf8a83f7e0c3917c50175b558da49c351accbbc4c03d880c1638f99cf26546d704c600d57eeb564f884f6151ccd7a8f9bd15ef0f064029287258d11c WHIRLPOOL 41d914ce26d9db2df12cfd1b3763cb8b23dd2bed1f0199b89ab5213036fbedd7ed65c352aedb6e5e28631d12e6b37340b4a3c8b5a82e3f102398f6a4f12138fe
+EBUILD libpng-1.5.17-r1.ebuild 1430 SHA256 1e342d6c20ef27fedb85d4f3ccae349b1edfa0a15f2fd34c0d14f432201b9caf SHA512 c8679f5525ec64322378506cbc5026dcd8a65b0d935c0bc470e7daecc1a53a52e3a9fd8882148bea79f439027ab26abb1e7f9366fd4a519dbf1917babc3b9022 WHIRLPOOL bcc1a04a7517c255892a9eac2ec96674fc125212461745a459fbdc0c3d403dd49b64e6d4316349d28494206202242e17808818a9d627d0008b7a9f49443abb3a
+EBUILD libpng-1.5.17-r15.ebuild 1516 SHA256 f17b2a0dc9893e76356104cbdd962ce88bd1baecf3a6005b87f65883010d8a43 SHA512 4c6e81ad35eb9a1ab8c201862459d1651c6ed76003ec0728177a3b27309a14aab0e5f097b86745a57bb363efde23443ec6ede815cb17b4e4ecabdd204052112e WHIRLPOOL 212eb2c2b61a615b4371c82e735e1c359bf35d2c46577a272a6cff309c69fba4370bc467b420f7c50f9c16bc7c617af8d286f8da0cf07996688c197589596600
 EBUILD libpng-1.6.6.ebuild 1514 SHA256 b1868e128e588d1cefdb7a85d318782fbd92254fbc2731bf623398bd8358e66f SHA512 3a8197fa69f5eaa2a5bb0d1bd932639f6cac18e2952874a0192600dc9348d107ea968938b8d7b7cb720768ecbc303d8b7a9b20f7b869b9070692d71e78496972 WHIRLPOOL 7c98e7cee6f6df6a74a8063db9f3d74b766636f54b0b1d74745cb850b8d8ddf43c0d1b28e7e2b355d35946c4e8c93d3ca026be4c4338b66c0049efce862b14ef
-MISC ChangeLog 56127 SHA256 826b605022d55bbfeed8734e1f946f246437b420d88d36b51846edb538015d6d SHA512 e5ec690a8f37f3503d2f087d75c0a2bf176f32d17c68d62b2dc3c646b6e378313ee1c0cd1a94a7f19721854ff4f6499ebe8d4262f98bbdff749fe6a60e5990ed WHIRLPOOL 80c31a559f0b1e6f9a103e1027db5993082b301d6c876d30741a77fd246f615abc870aaf43987e1eb8fec4cb6e0e0c5e3f604b089c6802febdf6fd44cec1024a
+MISC ChangeLog 56479 SHA256 b21a06e3f6e7bc21c9e296ec576d04ca6133704a17ae3e154bbc4b9a64840003 SHA512 6d0fe151ffe340954e344e53d2981207fede8849c1ca5884edab013e80b69af0ad7f10dd3a7be1b77b26e67ad773eedd60b1154441bf457433fbdd3a892e4996 WHIRLPOOL 342da497b4761bb6b5dfe48c45af8d1b7f70a31f4a9620dc0a13c9377f464ad4627171f1f057816b46276649679f8e51f6df7a22644d387c78fa2c622da52b8f
 MISC metadata.xml 326 SHA256 b3ff7fa84cb973407915b046ba95aeb5e5fec97707b56978093a16885922d6d7 SHA512 61db558547cea5a5bdf4b89326d76b12aad12eab60bb26dce3fdc7360842f761e692855046bebed9d2e63b5823a11ac34bef0f5721f48046323ced30841cd72f WHIRLPOOL ab8a546352be7956e990d777bbe8e20429fa2eeabb1a8e9766bce982f5f0bbe4730a57dde96880d97837021bfd8e5a09cfa54e898c01c31a24b02bd0c2526666
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSSuHcAAoJEEdUh39IaPFNaskH/3JxahxuaQKBh75TT7yuEbik
-OkmqhMBCZYBmfVt2AIz8is652hvwikaBbYPkKTSGzV6CZ2S0ZVyaTsXKI2t4K5AG
-vLTzNMmmdI+DyCfI37LwT/m67Nxe6ViunxLBrI8CulEx2ynzXsdQaUIeQ9XJJL2Y
-SJ3uazWfBH0Hfx3+160zpfqTOKw+CUWfroZUcHnytVamvZd0+K9MBTKNQJYhdzZo
-XaL8gm8gHikMa6DhIptQomho/5yjhP8p7VCYaYLFnuXq9Dl7p9+29lQKZ2UXDoFq
-nYBFbvkmtG5A1F8NRGOisxo9dtI0BSniKmM5H7EjsU0WoKjzbASdYzSngWyE3A8=
-=llsy
+iQIcBAEBCAAGBQJSefn1AAoJEPiazRVxLXTF1IQQANhQhPa24f+DyzOWc7uZpuic
+vb5TwLczlQeA0jzg38k5BC1EEU226NZ3Q+doiYca073trITwjWZyqF5Xz3ocECb8
++xbE5rCTKNNIGH+2Rgn69VfMIVrgWZSvFbv7grvcwL6naa/VaB23fKK8N0sqxykN
+VRvkuuugnN+q+Jz3vdRRUQ09Zsjf21B6r6NA+iyDPwEZ0Rjt9wGQlV4pjLvMSo8d
+pitI+G49whVazhrecId4fshFnUlVhW1O0dKZ4BrFT67+qTRYRs+tACQ2hnqekshz
+1Igc5+ThnThdloVVQkMpGkl+kuamgD6fnwrASKL014hbEWhs9UVQ2nuThGPrHeJz
+xOLNonKenD22JPrb7PoFYxTtb01CejqERF16tGazWnTaA+cMXpJsAr3oMdAh8LTs
+A7zvDu6HfBRUxTNhoMM8HMEnPv2a1PaEHUJokc0n/fHGXT20rftKxqg79MK3hoX6
+LpiUKY7kkQvuG/2lM0l8XysyWILuIxwnVGmzYWjqDwYWehjWMKM+jOYFlpsWJJC8
+no5zajDrmZLpTP5AdtaqfThEPNhGVUWFze4wBw4Te7FDN3CJBuGF8pmPqfOCljOv
+uMVhrMQCedHVBrO+xhRR9dwQF3Ew37tZ2BAZ31oPod9nOjRKlCGTnd10l002Onxh
+ShKJAHnq9QsiPIfYioto
+=XnjH
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/libpng-1.5.17-r1.ebuild b/media-libs/libpng/libpng-1.5.17-r1.ebuild
new file mode 100644
index 000000000000..47692942bb9b
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.17-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.17-r1.ebuild,v 1.1 2013/11/06 08:12:36 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils libtool
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="0" # SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng neon static-libs"
+
+RDEPEND="sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
+
+src_prepare() {
+	if use apng; then
+		epatch "${WORKDIR}"/${PN}-*-apng.patch
+		# Don't execute symbols check with apng patch wrt #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--enable-arm-neon=$(usex neon on off)
+}
+
+src_install() {
+	default
+	# Even prune_libtool --all fails to remove libpng.la dead symlink wrt #436996
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-libs/libpng/libpng-1.5.17.ebuild b/media-libs/libpng/libpng-1.5.17-r15.ebuild
index bb405f10fc77..8ac51861fea5 100644
--- a/media-libs/libpng/libpng-1.5.17.ebuild
+++ b/media-libs/libpng/libpng-1.5.17-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.17.ebuild,v 1.1 2013/07/22 11:51:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.17-r15.ebuild,v 1.1 2013/11/06 08:12:36 polynomial-c Exp $
 
 # this ebuild is only for the libpng15.so.15 SONAME for ABI compat