gentoo resync : 24.12.2018

5 files changed, 57 insertions, 9 deletions

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 4dc6be307e96..2bc63b584613 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -8,10 +8,13 @@ DIST libpng-1.6.34-apng.patch.gz 10411 BLAKE2B 4f6a5f7c2dcdc47e88a4687063958b18a
 DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56729a2d11e78361292568dce5c33f8fd24c56a5c5a007f419b8bc14fdaecff6db05ac2acea51b2374a1f57b848 SHA512 89407c5abc1623faaa3992fc1e4a62def671d9a7401108dfceee895d5f16fe7030090bea89b34a36d377d8e6a5d40046886991f663ce075d1a2d31bf9eaf3c51
 DIST libpng-1.6.35-apng.patch.gz 10396 BLAKE2B 5f69db106909f690f3fc96dc14db3c7281c3abb0ea9cd119fcf0cb6584eb1eb5f244d57e4ec7198614f3df5f9b302c0de2b447ed0cbacaa7b15821c2e3c23cf7 SHA512 40cda24d003089c31786b70fd581cdd960f338ae89535646a2188bc8e25e603a6ad2080406017bd45edb298442a88dd60ada1ec650b001596d216e8194a3dda1
 DIST libpng-1.6.35.tar.xz 1014320 BLAKE2B 2c1d8a4a1af8d5c67c8c18414fc1c32ad41b81e5300b3fe72c2bb89afece764087c7829308243e5eb24e7d685c56ba6c151b66ef64603528ac0406d89dd4cc4d SHA512 b69152bc7869e98536effa8e45e2dac7bffee26aa9e31fc90b37506a702256919bcf4dd9cadc42fa4e45143bc023ffd7c637742367e58707e8c2226b3a09eee0
+DIST libpng-1.6.36-apng.patch.gz 10329 BLAKE2B 8c97da493a1eed697d8bbba96dea992b17360f5e4844b8d43c63a73684f09094d28d0032a8311e39f633c449674e7aec7bab0e923d9df8ff2a7e17caaccdef5d SHA512 1c82e2399dd6dea14955a4e8da8d3f50bbcee42676dda5d7abdd36f27d1228924b0107d0174258adeb2eec8ba74b267d8a778b72b72f6dcef176608d5ff7c912
+DIST libpng-1.6.36.tar.xz 1012544 BLAKE2B 6b89e39e5a301e9e4d7fe93d97e4b8695a214b5b102cc1b21455baea2608b99003110f6f20beb3464e1cf62762a35917bdc07f31ba5aa041776601cc9651809c SHA512 a86ee977df69748e5039fb0ead883f1d3f88b8a701fa24cf8e62dd77c5871bb46397d794fa33ec1d0be1ac488246832ad79d0e6117ac093bdce1b2a1cfcb2bb0
 EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
-EBUILD libpng-1.2.59.ebuild 878 BLAKE2B bcb170292ebf723944a3ebdcdabd0978d548778d214bd1f81243fe01323eaacfbe9fcacbef1c6d4d7b84b0932e9dbd0a2c1f87c82d882d47e5fbdf1beff036b0 SHA512 225d15ed33d45e502c8201a233a0267efe5c48224f070cb74df69a8aed938a3873386379e242df3263de3b6b524335462ee15512d9d90ba0fa89dedb1f4237ad
+EBUILD libpng-1.2.59.ebuild 873 BLAKE2B e19aeca3f3b0595193b7b6ae55d0c9d4f8aa63a4475d305f764870ffa45cf7adf2b18c9203794d4516b2acbe1f10b7a1856fd09203078ee922bc60aceb559a61 SHA512 8b178d6afd6588e14225260442d63082aec001ad187e6acc9a8192140b5e8dac321ac3ea18d36f2194c885120b3c5a71a6daaa1d020a270bb1cd5199f918321f
 EBUILD libpng-1.5.28.ebuild 1640 BLAKE2B d0af71276affd9ca437a019bd0a545f09bb7e9eed44db91ac8bea73171db75d3a5670a2b9dc12b4ef137e86bdb7eb97fe88cdf11f4914c218d20c25cb6274507 SHA512 4f57dc6dec6114934d60f09aa869f358e85df7bb1f8643e05f02846955f3c26c3f9518e46e6e0a9ae4da538dcc70960d687b0467953619f62f53fdc8cff68a94
-EBUILD libpng-1.5.30.ebuild 1649 BLAKE2B fe9dc31be254ff89e5f0cc9d002f61655cf5c3594b1a380140b4c84eeab55a15e5cc547165fbb53f531ed34553427c6bfa85e0311000a6203378e8c491315259 SHA512 42b7679c08624bdac87618ced85e862f4351cea55347908b3cb590f6f664bbb4dac8552dd42195049cc181a1e5314dcda7e33319ef235440ad84474b06859b3a
+EBUILD libpng-1.5.30.ebuild 1644 BLAKE2B 059c2e421bc2955c6ebe7ca95b173f5e85e1fadd8721eb23d0964f786a5497751ee8c01de67370351e4a0b5ca99fda3dfe157d2489e194e145ed636134ef05b4 SHA512 64e8f007c376d46f9d7314b7d4bc322a9c25ca9e470f52fa607175f95e05e2c00f932a406daeab634710b0825a5a5714b4401d2e1285b3b23f0da1435142eebf
 EBUILD libpng-1.6.34.ebuild 1360 BLAKE2B 11d1403fff7fd1bba30a01824ec30a7753bcfefa033a06836d4002acd282af289b5ffe33e2b38e82f866043080671c965c605e46cc3ed059d3af9adbaf468a3a SHA512 666bb4b039a0c61289d9d2b37de6cfeabda2d44254b0a9a9d3c9a432abedf47371cf543ef9e5781dad8979b5fc77d83a26d36aa6ce15657230230e2307364256
-EBUILD libpng-1.6.35-r1.ebuild 1378 BLAKE2B 946496926a8643fd012aaa471b807cd9720b179b9454591cb402d2ef8a608732d2f477bf9537e1b7add740341319a1fc6003e9d3fb094204cb36f9c7b5bfe218 SHA512 f3aba236a38fd81c4f65bac2a0c44e1c52b21a787bd800d22db68ea44d27cffa68dd8e5b8327d77da520e73e5ea1ed661449c4fa0e31c4862bb53afea321b555
+EBUILD libpng-1.6.35-r1.ebuild 1366 BLAKE2B 636abf93f9ab7046999e76bb81f555f827528440edc7f81c3501487d7b981bed00357859da492d1aa2c642e601f08c09176b0b6355b414094772b7c3e6baba89 SHA512 985b78aa59f7cca239e8798b2afe31ea6d0778467a50f1d0e09a230f5259826b542b0ab4069b356618e9d2db38bcc498efc851eb1f7e7d4cac4432bd23c65e08
+EBUILD libpng-1.6.36.ebuild 1375 BLAKE2B 1e4df515db793d7fc7e7dbecb3a9b07c56a3214ce337573a9f91fd010ce20c52504d0d6367122418cfb2d21fea4f6f289036737b9fad3b52a6a0e1d6113f9788 SHA512 19f546997b31fbd6dbdf4fb4bc2cc113abda654d7c8a933e140acfd33f6627377e75bdfc7897fed5af3466a7c02ca8a63540643c7e1f8f7a655d5c1a06c03583
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.2.59.ebuild b/media-libs/libpng/libpng-1.2.59.ebuild
index 0ce40d82cebe..1cc6dadbc698 100644
--- a/media-libs/libpng/libpng-1.2.59.ebuild
+++ b/media-libs/libpng/libpng-1.2.59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="libpng"
 SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.5.30.ebuild b/media-libs/libpng/libpng-1.5.30.ebuild
index 104f5902b428..0d291a42e7aa 100644
--- a/media-libs/libpng/libpng-1.5.30.ebuild
+++ b/media-libs/libpng/libpng-1.5.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libpng/libpng-1.6.35-r1.ebuild b/media-libs/libpng/libpng-1.6.35-r1.ebuild
index 1d52884457a2..97270a957376 100644
--- a/media-libs/libpng/libpng-1.6.35-r1.ebuild
+++ b/media-libs/libpng/libpng-1.6.35-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libpng/libpng-1.6.36.ebuild b/media-libs/libpng/libpng-1.6.36.ebuild
new file mode 100644
index 000000000000..1bce3c6cb23b
--- /dev/null
+++ b/media-libs/libpng/libpng-1.6.36.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng cpu_flags_x86_sse neon static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	default
+	if use apng; then
+		eapply -p0 "${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() {
+	local myeconfargs=(
+		$(use_enable cpu_flags_x86_sse intel-sse)
+		$(use_enable static-libs static)
+		--enable-arm-neon=$(usex neon)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}