Version bump.

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

3 files changed, 61 insertions, 16 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 7b2fe145b429..cbbec7210c54 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.453 2014/06/09 23:28:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.454 2014/06/25 01:18:57 ssuominen Exp $
+
+*libpng-1.6.12 (25 Jun 2014)
+
+  25 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> +libpng-1.6.12.ebuild:
+  Version bump.
 
   09 Jun 2014; Mike Frysinger <vapier@gentoo.org> libpng-1.2.51.ebuild,
   libpng-1.5.18.ebuild, libpng-1.6.10.ebuild:
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 796976a890b4..696a3bac4487 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -6,25 +6,22 @@ DIST libpng-1.5.18-apng.patch.gz 9580 SHA256 9b0d8edb61808e9863997055f7fbb157487
 DIST libpng-1.5.18.tar.xz 730340 SHA256 c093c2f779fecb029e51b73d6d646b77edce882474326485f50347606e383585 SHA512 8aac73a76498da3820422ac0ee980bf687f34c7b2e828fdad6add705753c6be747d49aa354c130764acbf38fe75a3d54757bc14557adc52d8cae9fade52a4167 WHIRLPOOL fb974316278e1f0a875efc54c878b984a3e4e6baa8a848785131d3be1d83c105a860018afb1c7edfe3f834d1adcd548ddb7136b3e7e19ead16cb48356546300d
 DIST libpng-1.6.10-apng.patch.gz 9573 SHA256 0f159466ae95511a05d701b6a28d03d09ca19598236579f368cc13aeb23d844f SHA512 b75dbc2bbae3b565dd1abeb1072dc4c1ceceadf97f7a35c1148136432457828a0e6f14df7cf469ab5c775c745be0729b927297207ed4fd58dee1bc635d53aebf WHIRLPOOL c781e8bf9a60479cf34b5ad88c0b1ff60ec7b5f5671e08aff53c34b7f33c86c8b4171c9bf3e6c597c825de6517fccc8fa3eda0f788acad96889dc13e0946d159
 DIST libpng-1.6.10.tar.xz 898452 SHA256 4003f0fd0e36110a2b742fc5b9e1ab93ed7a7ab57ae8dc65f0e8101458775a56 SHA512 f475ba5544b11064544a1571e194a7e4cf387d386cd9f300f8bbdc252636a141ac2beeff47f32ee45617d894a8dee8c0c81e71ba3d0c42a47160ce32078cd1b5 WHIRLPOOL 461c8574c394e45886991465ef102b19dc47739e2197cd660ff91d0ce4865bb07dfef84113de655f9beebcf2c4b74e3fb097be6285533a877196288922e93742
+DIST libpng-1.6.12-apng.patch.gz 9586 SHA256 5f0f89a226edac5b5e6f45ee12b42a970ea1e3a4366bc72e584a7e3f44a1d76e SHA512 d22572263e7fd2ad98004290b567704b8a180a5877780110e5671e3374ab7fa27c9c770de7b40bce44acaf78d2e29742bc93ccd51ff22b15707e8fe8ca5c82a0 WHIRLPOOL 995e46d9616f7270ffbcc54b7ab2496fadcdb60080e5af4a7756e30a180866d2afebacdc66e1db7335c9c71cc93226f1bca19f481fe506389ed43cd7038022d8
+DIST libpng-1.6.12.tar.xz 902368 SHA256 c32ff6d299d2686b65708d4c6c065242d8c2f3ed54890c47d518c3ef568e6c5e SHA512 7cdf40b51a29f4df6f5be2c6946de80aa74c54169ceef2ed089fad21bf035b5672ad7e8983ca4d72edd4bb84c9d4e0077479a20e526e27685d30da03230bbb91 WHIRLPOOL 0a3618c64d3af848922a58cf84bc329b9dde33d43ae795e1d1f3d07582355a9a25cf5c541f2c3ce7c5d4082e3fd1294e6dd34c0d765e40cb860181d507876bc1
 EBUILD libpng-1.2.51.ebuild 1106 SHA256 dea46b4f8b6869833f621df20e3adf1d64bfb7c401d72662f12d455e2daf26e8 SHA512 6acd2fd12900af3cd119267120b7c7e3d73e2527af183366508c1d91f0388ce6f5f6426be33a9be5dece8cf629ae55786d93a0dba94e4a5a0970384af9357b36 WHIRLPOOL 7042c88053ae711599c6198e4729523aa772705d93832a9e8aacd20b58de23da2d78e5bac69ff6a218fc0262de1432097afdea5779d4c012c612086e767a171b
 EBUILD libpng-1.5.18.ebuild 1507 SHA256 8340d843dfa28cf02fc69e9aa35706402c4a01521d3e280c47ff4cff3d10c43c SHA512 adf0e77f80cfb73229bb08fb9e30e00bff1cf9b5d4cec618aff022c52239084ff1c50bf4068b462e2980248d57c44afc41f281f4f4c4c19d9d30c5e00a9c1e61 WHIRLPOOL eba64bf416850cf125dc1e787eb7d92b9124098ccba71104beb45a7a0386763e311e45fabd1994d01c965fd007314b48b407fb06afc6f853b66c4768d988cd7f
 EBUILD libpng-1.6.10.ebuild 1507 SHA256 3e1debfdc9b6fdeffef39cd0f13a0cf3f54acb7187f872e5ec79e4b299214071 SHA512 986152522e6572cb7a92540a012bfe2244bfbdf2a6ec23fc7c40535ace94dffb147100eb1c74274c23db56e9b4dbe943c50245351fa58867fc124fdfb2ec1547 WHIRLPOOL b6558d233624f47295e2172b20c4432d0e6c67c5d82552ba5309a58b38ceb26caa8725e47f64fe2a19b7db79da65d6d8d3cc39b12465ef12496d746ef3f7258d
-MISC ChangeLog 60441 SHA256 24f51a828889b7f9e3434c80410c7ad5cb134a6bce3573244f36f965f0f074fe SHA512 68a396e042d1c4b85fed2fc998043aefa302f6a21238f28c0a0524f046cec26fbe0cb13080f0005281151bb559c9d2a93bc46d19996fd131d80fc6c6d2964147 WHIRLPOOL e151d28ffb73ef52e31942aa812fd843fe14f79f68669d9e91c0e97f6c4c4f02a64b07b4ebcdaf4add0cf176f19b6adf508d13aa0f22506b301f9f4471f9f62b
+EBUILD libpng-1.6.12.ebuild 1522 SHA256 c09fa171bff22ab48599d3a086666fa119b711c78098a2aa867aeaeb72043638 SHA512 ac4e66a6adf8e36ac7fe6b3d5edbb861db4b61a214def4c6074e729ed0943a6b4a19d06b4b5ac83477d9d9b98f1792d7997363d49219963e0e9413858c132818 WHIRLPOOL 34bc9ed795e7505e21df6a789cfc97947a1209a144fa71fc9fe7215452517525e4bfaa585a6ea71393b75b3086eb7affc85eb54132496e3c142f47b76cb67030
+MISC ChangeLog 60568 SHA256 7df6b9a3886e9b38d6f921bbbe904f22d498d7002bb124586407f86edb82fccb SHA512 ebb03ee92f7503254e13a4c3bf1103166e7cd95538c2ceafc8e01daa493954d97c22d22cab7989b0a421d0cca8ce6dcd69ce3f4df66c0202fd0dce62df30ad90 WHIRLPOOL 0e3c4c5469d9b02f0e1b2eb0ddcc4668cec4470a33bc9092949ef1046bbdc6d168d32738de2c9d04fa954128d5c03225f4da3977fe6d18129085c4b1040aeb94
 MISC metadata.xml 326 SHA256 b3ff7fa84cb973407915b046ba95aeb5e5fec97707b56978093a16885922d6d7 SHA512 61db558547cea5a5bdf4b89326d76b12aad12eab60bb26dce3fdc7360842f761e692855046bebed9d2e63b5823a11ac34bef0f5721f48046323ced30841cd72f WHIRLPOOL ab8a546352be7956e990d777bbe8e20429fa2eeabb1a8e9766bce982f5f0bbe4730a57dde96880d97837021bfd8e5a09cfa54e898c01c31a24b02bd0c2526666
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTlkMTAAoJEPGu1DbS6WIAERYP/j01ZEoNj3obvxmsGA4uXVhK
-cDwroLIMWXd6oOvZgA3lHWvSBOSeq5hXA2V163DNQy4sWg/9TwWn3r+cjP0mk7HY
-ksSehfLhfKWaO8Fy2baeOyEGUtislmL+hbKJ8853Mo5USHRBwmI2zIs52J4+Ovuv
-dBwPUXtOwFkkqD4tbHEYR68sOkj9PK2LgkH9BwPDpGbR6R1rn21uxbD5e7ULJl3c
-0NqkKQnqiI9pZQlu2Sn1o+rw3BHM5sKchaqNSbsR53+HBpYZdFMIpjBB7p4JMxWx
-y9erWsU+H0TKrbO2GYUl4u7tjaYIYZRT95AkgjWT2l5lXno3GnHRGbyGbKgTu5/k
-xGCg0ciyFaOJS3H8JByXwUlVFp4Fmvf3Qp3+IW+dlYjrt1p4rgGs1XROS0mrF/QS
-O3RUraV+7l118yb/9UU80raosPo5bk53hl+lbisjxeblCqU0GancWg4sSZx9FVO4
-KgZca6JKsbR5MOasDsGXzy+u9nVVJEZvHT3+sfog+tgm8rZAlW/R8ZdMVHJFRBfU
-QcPA65QqeHqbDO+sdbmKfQ3W2TDlQg7FaMQJwfyai9z7Si1r3wAUlnqQWFFcVHwo
-HTI079OkptmlFTgJ/7ve6OMFAKMpikHxQ6TdctGZL15yXxVXnALtiSWVSoMjq9M3
-EaYOA7bljNnJQg41cK4d
-=57be
+iQEcBAEBCAAGBQJTqiKnAAoJEEdUh39IaPFNplwIAKRTABuUgZ2IKZnhW41jRQar
+PO9abPhn8gjp8rxRGvDzw4zjuSHfgqXKGu0WS/Syti4EH9QqQPeGlMRyxV864+1U
+SaSEztu0hC9+hpyWFsiozuwN7H7JYCic+e6uq4RhHWu7lWSeeckyz+4rx6Wz6GA/
+KDiOcEsQenpheG//Dxok6qJSp4VWtuM27odgglN382ZeMBY0265JPvJLD6ktqgGC
+qoaIX7kx3gZrpqMfCJ2htBIyZBGEcoAyY4m9tjYSOAbfc9SuI4h6qHWMQEc2QMmi
+c6GMP4gn4ZlCmKOVp0ogdVQ3hxchPQcb9hu30D39wU/wQxIrpSx42GAeBWcCySo=
+=pLZ4
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/libpng-1.6.12.ebuild b/media-libs/libpng/libpng-1.6.12.ebuild
new file mode 100644
index 000000000000..5d62d18208f7
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.12.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.6.12.ebuild,v 1.1 2014/06/25 01:18:57 ssuominen Exp $
+
+EAPI=5
+
+inherit eutils libtool multilib-minimal
+
+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 ~arm64 ~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-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+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
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		--enable-arm-neon=$(usex neon)
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
+	prune_libtool_files --all
+}