Version bump.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 105 insertions, 16 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index a4cf7b5d838f..6b0f72272b1d 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,12 @@
 # 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.403 2013/04/22 17:10:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.404 2013/04/26 06:40:55 ssuominen Exp $
+
+*libpng-1.6.2 (26 Apr 2013)
+
+  26 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> +libpng-1.6.2.ebuild,
+  +files/libpng-1.6.2-noexecstack.patch:
+  Version bump.
 
   22 Apr 2013; Agostino Sarubbo <ago@gentoo.org> libpng-1.5.15.ebuild:
   Stable for sparc, wrt bug #462314
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 8e1ca05f5a23..c1ce99c4a75d 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libpng-1.6.1-Corrected-length-written-to-uncompressed-iT.patch 1613 SHA256 021836d31eccf5d12816463af72340b88a342285de0b7964ac016d8b276eabb5 SHA512 fe80ddd24c4a5beeb8f50916e9fdc435cf2f5fa48a4cb7decaad4d39bff81b54484817d23cae8e7381d6a1ef19dd6788b1474b3922173aa79cf40c6b20c2f5a6 WHIRLPOOL 3b0d14897eb488d894ebf4066cdb81f62b43d9e96c859dd698bd2f426bf3f4d7f0898e752e5b9e54bc418e25c9728b9fabc40f6953aa678f6ab8ea251b3f4d79
 AUX libpng-1.6.1-Fixed-previous-bugfix-to-work-on-64-bit-pla.patch 1045 SHA256 44bb557f32a1836cc240d40f38edebf952573eb9e86d14b5773174816ff6b390 SHA512 7aa39096dc3c0136da0d9fede69f44fe90453c32d051f66b09b1358e6b70b5d76bf3a1d66de2e480e9ab078e7b28e87f08e3f60052ab61b132d8b6735f5a73a9 WHIRLPOOL bb496289719758aded9af59eeac8221bded7e80631a310f734bb6a9b9b4cf24202e36cda11f848274dacb62dcf401a6765567ddf6d94c1a81efe6609e9919f53
 AUX libpng-1.6.1-Removed-extra-recently-inserted-line-from-p.patch 755 SHA256 2817160dea49bff3bf2983f534a7d39095bb4554c58f8badf7bbaf611a197323 SHA512 fdeb5ae8f86df592aad56f607dc359e07e9923c6a9bd5275c0859600e574f5363db85ed5632a7ef98425e9faa5661c6a76b13ea760270c4b28291ce4f5283d8d WHIRLPOOL 6d1f014df0b0e2c5ecf0141e6e864e3225d70ef2e457241e9b5a986a02c62f0b9a49b10a82deb50a898c9006544d498fd2620d614f7b2d4c8206de2a8cc6abbf
+AUX libpng-1.6.2-noexecstack.patch 880 SHA256 3c2ad9b7cd4300f0c8f7dbee45fa249775d5dc7b3ca13bd32562594246a94055 SHA512 c9f540c5b61b677e819f927303677bffecf294fb714d3951cac5b4f89060e9518e5ff45f7ae403021883a136934b13e8ef994216a42762e279f934172210bfa8 WHIRLPOOL af318b17812a03fe9f2ab0986c6f5d981f11a5b7e1e97d3224b2c5db43e3c9a8ac6427f921f331b15b2014c9b3e20bc6942c9fa7b636fac63573305caf219b6b
 DIST libpng-1.2.50.tar.xz 539152 SHA256 4724f81f8c92ac7f360ad1fbf173396ea7c535923424db9fbaff07bfd9d8e8e7 SHA512 a6699d75722e359a90a959369abe612e6e73e76c7c80231d99546c94bb71e92bcda0bd6e157f124176d96341dca2f61e2394689449160745a85e8b4bbe66b227 WHIRLPOOL 90a42f1d209e75dbd14014c843d37f754119cb6b95a07f5195ee63ea18ba8022132f8aaa6e91accf142dc64c66fbb764794fc57f2544581d561b7efa2de05a1f
 DIST libpng-1.5.13-apng.patch.gz 9254 SHA256 fd1189b5978725e840ff9521f2ed18d3e68e97913270e4593ca3619ee11f33a2 SHA512 116e5ddaa4b925ad53f845ed2ae139e001cf96dc677c8693477af7b6a347e85090d57b146a4b9f02f3d8554ed7b6d806d24ab43abf3d915c378014ba3a615db6 WHIRLPOOL 89a60a08e489540755c7a4f91574067a1958d7534ad9a28dd202c044b12d5bc856dfa61632f741cbb5ec8871914f09f6982c1c94c6b41e2c17cf94b50745b095
 DIST libpng-1.5.13.tar.xz 705912 SHA256 b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee SHA512 ef0b324e2687b1d9d8a632f93d0a7997d2d8031b2211cc426f517ffa9543950ef8575bb19bf380d454ff9a9a5106be154e6df59e5d33407773e124eed9e4bb41 WHIRLPOOL 315c46e710eb8e7775ee4796ad5f4d95178b993e770859d0016ad591c46d356ce20a998f0febe8864b632009cb8dd57f454d2adafdd5edb68b06233609982c02
@@ -13,6 +14,8 @@ DIST libpng-1.5.15-apng.patch.gz 9490 SHA256 c255ca366131f7aee6a66b1e4b31010784b
 DIST libpng-1.5.15.tar.xz 718692 SHA256 95c3b4c53fa57694cc940704a1cddf47402dc885d53bfe1a6910975de1a357c5 SHA512 248c28caf737149d6d0d670db2f28f8b95531645476a1e3b96ae08b903ebde73e7fbefb410da2a75656116113575ceb411d8e86812848a047f416c36d872274a WHIRLPOOL 058390239a419c8249d956964874419c5570708c74fd01207f1e9067fe3d3f8598e7d8af3cfe165d03f8ac5281691433e61ada7e50917c98b8269b4fb451a533
 DIST libpng-1.6.1-apng.patch.gz 9572 SHA256 046dcdd31d16d1cb71cc7340651c4437fb86aa3004c2765341d2db53a2ffb60e SHA512 d4c56dfb516b7164df2610685bfe638b6844adf16762d64d192f47e58f179088fddecea050fee92c863fd860661714082bb04fcd91082815382a53df5839106e WHIRLPOOL 266719e4ef4ffe93184ca02c3f9e798acec5cefa57d414bd47efcbead8cba30f8ca7976484f74514d70cd0c1a1a3d6c60327573a02978566a0a80d9661099f7c
 DIST libpng-1.6.1.tar.xz 835656 SHA256 5ef57f8b9ef591c8504e2a8f78d31779f0c8f2b34b34d01d533360d2483c8946 SHA512 c4eb18e7f93d6142346ef59bc0e5554d695b78ef011ee6b3252d945aa7a847fde9063bdc690c5306b93545a64d2fa913409f975397aac792cfc1e491d2a51d77 WHIRLPOOL 72ea4068ccc145d5fcce1ac9f8d0852c0b1eea759f351d5cf58a88bc64b0a8bd691efc65efc7d3a2da8f1797a725ff880bde7c5c71653584f902780f53a79c57
+DIST libpng-1.6.2-apng.patch.gz 9571 SHA256 10dd088c443f8d233884bd73b8258d005c92fb0cf35d350ce5dc9ebac7b4eed8 SHA512 f2d1078b40494ecdfff125c0855049bd4a8db667fd4f2dd727a5768363a1a755f43d66147228dd8d5cbbd7148ee51adc74afe6175f8e4075ef3536141a95b898 WHIRLPOOL 9f12de4a838661633205a082c72128b54e14a9454bd705e8b8df951e8eaaa42dbe75c1ff91e4b73037649d319c67577c25f3dab50bcef5fb8c8dcdb2062870cc
+DIST libpng-1.6.2.tar.xz 836536 SHA256 1c97a90bc22107e50f04f77a0115f4ec890d5c6a373ac4c560e8fb87259e92de SHA512 01b1699a2ac1e687631f413458e7534b71f63b673c95b0d6e3501904a1b6e8aa82d8b4495033f4a90278963c1d4c40d81a7a17e976caf87690a23fb191ef75b3 WHIRLPOOL fb04df108af35bd789ef224addfedd0cb04959ae31899e4f3dbd1e9376e4242a93f34ad4c8fd8507bf13872b49f8a01b23bb7bc2129041a09be17434ceee993e
 EBUILD libpng-1.2.50.ebuild 881 SHA256 371168b4ea273ffd639aa71bb7b34c4d666c781969cf9b28e0f41f735bec5aa7 SHA512 4fad7a0852d44e0594495321fc1b7746702a48eaf4d1455ff6517158e934a12c5bb61b691fdc3df91291da9cc82e22154304102bf1ef11c4e9f93ffdaabb1c84 WHIRLPOOL eb7dc0101bc8df649c6e506d47642862626179797c10e874a17428bb6f2115bf3daf557521852eca0a40e417a714643c0441334f9612994c2468844510430c12
 EBUILD libpng-1.5.13-r1.ebuild 1376 SHA256 3b529b117f6f8d5d3e91d30b3c1cb7a87c0f263f8f0ab0b8226cfb06a7dd3b60 SHA512 0211d7d6af9725af0f1378e4dcb4fcd60b7c10451710917858089c4ecec5cd5506296c0228caf3d0102920aebfffd138b69232534d12d520b592db40c81a758a WHIRLPOOL 444b037b7eddef7a6505adb8723a641122dc9ca6eee32b6b8f835057c433f7948c8e3e113a54d29fb14033467b8b469e8309c68b1666e1d64efb950fd649a0dc
 EBUILD libpng-1.5.14.ebuild 1410 SHA256 1103413acb9a6b87da4cb6a863e100e1ae227b8caeacceca18cfc1785601654c SHA512 d5bba685c1b4f91830e4c1e3033a1ab52e57def516e15061eadfff73b67c79b8bc13d685579f439645eb262135cd6cbd3ecb48d14d49f198289cd3503c9faf5e WHIRLPOOL 7f2b737fb0e467c02ac4215d4680ef0ed09394cf560ad1b8d29ff48bcbe7e6cb614e4791db0d69d080a4db5c606a393a32dea6e7ec9fa1cb95ae596d7d418622
@@ -20,22 +23,17 @@ EBUILD libpng-1.5.15-r15.ebuild 1520 SHA256 1d950911fd4e1259d43acef8f605ccb9c327
 EBUILD libpng-1.5.15.ebuild 1409 SHA256 f25c806e50de0b1045596363bbe0b92cbcf644b85df57d2ad4495b4e9ee91120 SHA512 a7f574768029f8121d134ed5868e61ab5a7d6001969233a0856f1d5a864f9b6d10444464123bfa8eca8cf0e2ac5dd1e4985182f5bee515fac8f40c111375f415 WHIRLPOOL d3fc6ed78c68e18e645c4fc8157325c6ca01e1762186461c0055ab07a588fd5622506839bf5cfc22f9a301c3dfa02d1cc2744309ecfda97dcc456c6c202d6223
 EBUILD libpng-1.6.1-r1.ebuild 1918 SHA256 d3ed9f57a6cbb6d3987a9bd7fd72a901ec2d1295475adabb6f88a4e1b639f4ad SHA512 a1533dad036b17e014f57d9fb1926230d60a9454b757715c92babc158e3d366efc4cbca8622cf47dd4942a3bc2ecde62bfae55413cc8d8eba565882bd976112a WHIRLPOOL 27519f79fc2f3278c9ee282d5152fc4b2beb0d42ae9b620d074170e044ded7d2b3c916ff9a6f1c8a4ab8201a5280b9f89a064c5a29c5a8f7f6e87bde6dfba0a9
 EBUILD libpng-1.6.1.ebuild 1687 SHA256 dc81ae4b0e98b9187fff738ec09d2681ca196fa615b66bff3a3300bae69964c6 SHA512 baed22f4d375595f99c41de68234f0e88ab3ca986b4c302a9974c0f1f5d9eec57319317164e10d882cf904e61b2ddf6101293cb3bad0cd01dea6df06602aa23b WHIRLPOOL a35559cebf028031a86640d7e75fd65ad30679a415bc4ebaa41a836760ca7a72990afd6f86ab132e5e93a1f43b2d4a6eeabe0236d4c00cd5f3dab23a6e291340
-MISC ChangeLog 53353 SHA256 66920d1589ee05ff08954270ecc60597a79e99f06c53a09426b68cdbf2bd88af SHA512 3d7027da4ecfc208788ae738bfa48dab5264bdcea8a5a2805d554c89bd97dd38ff6c8b7c24f6930d5bc497f9228c52a5a02172214c315a3e9f6cefa751443571 WHIRLPOOL a27b06537777fc24714227bf90af1eafbc5596e6d21c3e95989d5b18f33b262611ed7ab06fac55f8764029fe459d8bf6334328f5dc14a5f4ecbb109c11458dac
+EBUILD libpng-1.6.2.ebuild 1745 SHA256 15651ec62836b7f991cbc67860503658b7db9fcfe30509c6354c60b13135628b SHA512 eda49d614013cb45c84e16cad235273ed6efb68b76b5ea13b542c2b8ae5a2d914c990df1626de06b2981097a71c96625bf0da2a210d02c1bb76b755c62b960ad WHIRLPOOL 64ada7a74629343221743dc01fb8ac2bc8fb2e061a4a9ecd654284ff9c4c0e23a8b8f6fd38263025c9ae582c11ec84855b0bcbd519801a1ed15679ac359c62c5
+MISC ChangeLog 53522 SHA256 84753619b415597a7156d6f89412cef436f1c9ee541e3b18f0b52db0c88578f0 SHA512 fd3dc5b8bd93feb125bcdbfe54d67dfa9f197a8b335712476d90466a8287dca90606ba409673f0985bc3271a5afb42381d32e7cf2fe228bfe28c2428e3809a10 WHIRLPOOL 013b94d86758164ed744b0c5d92d11a9fab919a35f0d1495aa59cebd7d7526a1ac434b2f7954266f1faef33bbb7c13417e4d9d65f661c093ae0e25d7c84529ef
 MISC metadata.xml 247 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8 SHA512 f87239088300fd36fad8c64309774ec33c6ee0d0b2c8a43b8bfdd4a53223c4e3ad8bfe31f8e7ccfc12af7ab81cf54d2440070e26ad2ddf774be0b40f9218f05f WHIRLPOOL fd606eed56c413ebfb17ef83fcd32540f0a871febeb21e7f17b77d687d6556f75103f0036a3be2ca0251071e5cfaf0ec9d71b1c2a8c087f68ea50f15bef87eba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRdW5QAAoJELp701BxlEWf3ScP/0M0JMbYoUX+bqZ4/E4gObsq
-AoVbnPPk/CUxLoFExjRBuXl/W8UrhbjsFNvCJKtf/V86LmR4YPTvOgro789hv7hV
-YJUL3fiKb93WQ16XduXnePM7IEHatiOyaNIA31A2BF5DzaJ9ki64AivlNawjWHLi
-vw54QlOD7CYBlSefjsD2Rx0wnb4vx88k3+fXSPeNqEbiTa+lK7B1KbWNDCnE2MkR
-WYTfksJXF+t/yOGo6nAMIGmX+wPsrTwk7/pyUCcsyAG2tqDWE8/nYDID3sSUOP+z
-etNANRt0KjZ75FxQH0oGhXssXfur4OIQ+vl7WpzerjIZWYHYYtAJoEH3ELb7P+9W
-GtSPOpwH6f7AUMl28o/Ecm80tQFOJfR5wVbEzxHudit0SpukppnFnyQX6vCnLI+a
-mp2UFWjL9xVpj5eNjG8aweePjFYGVK2FGEuk92UlwRflWz77GBsbSUI56oMD3Gpv
-AiTJYgQg4NGvV2s89Dsl8d3ozgtkzyGLv/2JPRHsR0NMRV/JXX1F+7VuHtifX+Gt
-dDnYRaMA9kKCbiQkMxB/dtF7BI3gCaTEb+c1+o8aUszFUB+yxqvchs6N3iKjEcKE
-SgU3TrWEhPEs89B+bkRQlhbS+412tFZMEb421abdN+4637bQbB+pXcAHedmHjibD
-BIhicOM8n21VMOlyQ9Vy
-=4yF3
+iQEcBAEBCAAGBQJReiEkAAoJEEdUh39IaPFN+3YH/R5nNlyUzY0/Wc6HKKAC3oW1
+uvezG6Wjf0YIzMbfzJ6oxe9pNKgu42vYTxWixlJ1jRsp9wAeH7XRsjwRMySZnQwa
+7gjXNFoAiRP952QDSQXU9MFjnNdWDtWMup8fAmDxuUfW1QIPj/B5VyMa5BjemV9s
+HmKj2W4nURan1g/VZLnBXfBK/kYExsoraC7zXH9TH0NsMACYOt2RTm6livxBE0Lx
+YHvN42oa2yZth+g9UPda9QTqWj12QgyCXYHLpsyJZ8jCMGmZTbpLBpYGSW7kKG5G
+D6/UBtEQ3CUZsofjR/7vFbiYnI4zqwLoe+Og6GwizE72JjIsqUV7Mc51fFEd/xE=
+=dS7Y
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/files/libpng-1.6.2-noexecstack.patch b/media-libs/libpng/files/libpng-1.6.2-noexecstack.patch
new file mode 100644
index 000000000000..e7fca51100f5
--- /dev/null
+++ b/media-libs/libpng/files/libpng-1.6.2-noexecstack.patch
@@ -0,0 +1,29 @@
+This patch is only for the 1.6.2 release, see bug #465010#c39
+
+--- a/arm/filter_neon.S
++++ b/arm/filter_neon.S
+@@ -16,11 +16,11 @@
+ #define PNG_VERSION_INFO_ONLY
+ #include "../pngpriv.h"
+ 
+-#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \
+-   defined(__ARM_NEON__)
+ #if defined(__linux__) && defined(__ELF__)
+ .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
+ #endif
++#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \
++   defined(__ARM_NEON__)
+ 
+ #ifdef __ELF__
+ #   define ELF
+--- a/configure
++++ b/configure
+@@ -12812,7 +12812,7 @@ fi
+ # Because GCC by default assembles code with an executable stack, even though it
+ # compiles C code with a non-executable stack, it is necessary to do a fixup
+ # here (this may by GCC specific)
+-AM_CCASFLAGS=-Wa,--noexecstack
++AM_CCASFLAGS=
+ 
+ 
+ # Check whether --enable-arm-neon was given.
diff --git a/media-libs/libpng/libpng-1.6.2.ebuild b/media-libs/libpng/libpng-1.6.2.ebuild
new file mode 100644
index 000000000000..74a954acbf10
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.2.ebuild
@@ -0,0 +1,56 @@
+# 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.6.2.ebuild,v 1.1 2013/04/26 06:40:55 ssuominen Exp $
+
+EAPI=5
+
+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/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="0/16"
+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() {
+	epatch "${FILESDIR}"/${P}-noexecstack.patch #465010#c39
+
+	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 {} +
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN}:1.5 && return 0
+	preserve_old_lib /usr/$(get_libdir)/libpng15$(get_libname 15)
+}
+
+pkg_postinst() {
+	has_version ${CATEGORY}/${PN}:1.5 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/libpng15$(get_libname 15)
+}