gentoo resync : 21.07.2018

4 files changed, 115 insertions, 9 deletions

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index a088cec63a18..212670a1d1dc 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,12 +1,17 @@
 DIST libpng-1.2.57.tar.xz 656784 BLAKE2B c8538234f3aa6411629d15cf77d85846bae081f779b0a1dac92f863ae68f1fe5db84e56df44df1f782fe9f6cfa0f4fa3e418fd12472a73c6f3e7d013e0921f86 SHA512 51338d900690fc2d28ea1b5b364d311d73ce7ad498d000985e0c3926b5df0df97fcd7bb079fc954c6caa532fc6e6cbbc266e671d62fc67eca30e79a5f0e26f31
+DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
 DIST libpng-1.5.28-apng.patch.gz 10330 BLAKE2B f8d195a90e7b7a5b3d66c35dac2b3e7ecb531d52504c8bf7401458c63381a11cbec4053691fc17de8473ffc5c1e7b333ccf6b4abc08797a60f857ca4d254d8f9 SHA512 f99dd6ccd08083a3328841c40fbc94347a42326b29948ec0260497e18da937f1fcccccc4a3636e86a8e0c6b3a094ad8b8ab411af58f56df820b4cf78db25cd96
 DIST libpng-1.5.28.tar.xz 755724 BLAKE2B 5d8b653926434a0e7fae3c5698069883ef97f8a97fac3c0e304386ed51606fba2422af955f092ac20f74ab2593a2d7e2e26cd82f9ff766ffc6a68bf85a96d9b0 SHA512 25adcff4429e7c691a6336a70f3c3d212aa27da6c9d6393325d9866b4c7e1f5fd40b9fe23b1efbe5629753a6051ab52365688ac14913584faf40e84e0b9f514c
-DIST libpng-1.6.29-apng.patch.gz 10313 BLAKE2B 856fadba345bab488fde90fd2c40c33b4f84cc965acc858b0caafa32b6c16456c7aa5a5d8cf02fe65f6ac28e0c24d598a61212b290490d9d48e831e9a4731dfd SHA512 348121e2b7ab1bac8d4ce3ab6e60f56f1f28bedbbdeb2f87b32662f838713460d8bced3401e9d736969f6fe2eb40d77028c9d4f569c59a091c860b6507026975
-DIST libpng-1.6.29.tar.xz 987652 BLAKE2B bf825553a385a06d060aa86686152070faf6476cfd5670e804bff00f24f9f5e9c024a8ecbe7772121bd94744fef5c6d728805c18ebdd23e6459b8be099d92f5e SHA512 070393423ec11f19e3264a0200959ae09238aa005615571586987253028b4ffb7e6b7c734a132f65180252b0259f79add03896d79fdc7dcfd8773b82c82a5ffc
+DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
+DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
 DIST libpng-1.6.34-apng.patch.gz 10411 BLAKE2B 4f6a5f7c2dcdc47e88a4687063958b18ae29c6f5168a339aa1f47abd8859126ea6d658ebc6645a8163b4127a5c0237f4b858fd0979781147fdd5fd23c0bb1098 SHA512 d4088399d2e9a2e2e40d5bd5dfb478dbd11c7065600287734aee7b3bf13a9574d17d3890e705c82705275fd0c11848155fbf960acd2e8eb890a7656b4140340c
 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
 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.5.28.ebuild 1651 BLAKE2B b651d04efd3f74d50225ebe18bd06aec7e38f933e44a4913ff973a17ee4799151171dfc78ccea2921be8e9b364c68f09f2d0bbd1e3ebb377f23667438b9a9a60 SHA512 94a6c624ce02d7b03071653184ac91acf949244c1c0c1d2cc51483e3ca8bda9860e6ba76e2a77513dcf4a08d717888bebb91c1b464c5c201d3766499cd01fd9d
-EBUILD libpng-1.6.29.ebuild 1333 BLAKE2B afb45e4346f2dc5c307c3d5a1c03a8ce9202b1182475fbf2153c7c0ac8b4398227e68e9d65b5d26ad4415a0472373fdd70ac89b6f06c599b245514d4a753a481 SHA512 0fd0d8cf9b06a6fdf8276bd7f1d7656d7211b01e42180aa8d69ae79f227f669d04460e6749e04a4ab03fabf55de8449faac6db5994aaa49c56049e8351941093
+EBUILD libpng-1.5.30.ebuild 1660 BLAKE2B fb558f645b19a85903c441feeac99b167018e01e871049553c24638d29d1e346f08ee40145b041123e7e4edef91ac35e1457e346cb9ab31117aa6ea65fb4e3b9 SHA512 def71347be2803699ef0023dc55f1bf141433b857543d4b91d16a7bf25d983fdca25ce736fee58cbe992a44ca2f84796f7b99ddc8e1846a65a51ebcec1519e5e
 EBUILD libpng-1.6.34.ebuild 1371 BLAKE2B 95fd73fd3cc816d70f5c67c7769cd04d02a651fd90263c67127f8a58048ba7f05a9032b1b2c808aefe7dec4c8e1f54846f6867f24fd1ae646092e5a5a9cab57c SHA512 57e3acb2e8ceef43c00a95c06ebb851afaece1d37f760623236eaa1670f21e62699661cc5f19e6143613954ba3ae7ff5b4d066d5baa7a7921ece775eef329933
+EBUILD libpng-1.6.35.ebuild 1410 BLAKE2B 00db84214eae13e31302605bafc4d5aae90ec2c94689c07d83077f57af789a2f3d67029b62bb6a383a10ab5840d64809ccfa36d9a6602c2535f37671ad2fd3d0 SHA512 f0468a14a6af89f495a5c00b4e50709d675f6997353e73b7e66b66feddc0151c97cb8b5982c4bfbf1e46b7bf52e77c6e22677288d2f666f84d5fe657ddb1593c
 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
new file mode 100644
index 000000000000..0ce40d82cebe
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.59.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+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"
+IUSE=""
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	!=media-libs/libpng-1.2*:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS=""
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf --disable-static
+}
+
+multilib_src_compile() {
+	emake libpng12.la
+}
+
+multilib_src_install() {
+	newlib.so .libs/libpng12.so.0.* libpng12.so.0
+}
diff --git a/media-libs/libpng/libpng-1.5.30.ebuild b/media-libs/libpng/libpng-1.5.30.ebuild
new file mode 100644
index 000000000000..0e1042a2c2ec
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.30.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# this ebuild is only for the libpng15.so.15 SONAME for ABI compat
+
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( https://dev.gentoo.org/~polynomial-c/${P}-apng.patch.gz )"
+
+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 ~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"
+
+RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	!=media-libs/libpng-1.5*:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS=""
+
+pkg_setup() {
+	local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15
+	[[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}"
+}
+
+src_prepare() {
+	default
+	if use apng; then
+		# fix windows path in patch file. Please check for each release if this can be removed again.
+		sed 's@scripts\\symbols.def@scripts/symbols.def@' \
+			-i "${WORKDIR}"/${PN}-*-apng.patch || die
+		eapply "${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 \
+		--disable-static \
+		--enable-arm-neon=$(usex neon)
+}
+
+multilib_src_compile() {
+	emake libpng15.la
+}
+
+multilib_src_install() {
+	newlib.so .libs/libpng15.so.15.* libpng15.so.15
+}
diff --git a/media-libs/libpng/libpng-1.6.29.ebuild b/media-libs/libpng/libpng-1.6.35.ebuild
index af03888d719f..2ecf29ecfe2e 100644
--- a/media-libs/libpng/libpng-1.6.29.ebuild
+++ b/media-libs/libpng/libpng-1.6.35.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils libtool multilib-minimal
+inherit libtool multilib-minimal
 
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
@@ -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 ~arm-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 ~arm-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}]"
@@ -30,14 +30,16 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_sse intel-sse) \
-		$(use_enable static-libs static) \
+	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
-	prune_libtool_files --all
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }