gentoo resync : 22.01.2019

3 files changed, 2 insertions, 50 deletions

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index c6f15d91ae14..bfd9456eac13 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,15 +1,12 @@
 DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
 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
 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.59.ebuild 873 BLAKE2B e19aeca3f3b0595193b7b6ae55d0c9d4f8aa63a4475d305f764870ffa45cf7adf2b18c9203794d4516b2acbe1f10b7a1856fd09203078ee922bc60aceb559a61 SHA512 8b178d6afd6588e14225260442d63082aec001ad187e6acc9a8192140b5e8dac321ac3ea18d36f2194c885120b3c5a71a6daaa1d020a270bb1cd5199f918321f
 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 1365 BLAKE2B af5ac1a2d6b23f8d719d10d40f261c6c4e1813a7397fcaecb42b2461d49c6090eb00268afb81e4a602e2826044e2b6c25a5c7db9404318c4f95dfdf7e7baca7f SHA512 a468177bff85f61a1373c508c0001e5a9746d46e17a1a29ea3bf17ec731598d6927c31e42878955ef15becf214e34e4d3258e139c870ec067e59196141f61841
+EBUILD libpng-1.6.35-r1.ebuild 1364 BLAKE2B faddeabf1a0aee8ee88b124800bec19063239e02e78eb159328df92bc2f2f85572ebe9e30a44283f9bbac831a7c1216b4d213c6bb6314813cc469bf2862ca45d SHA512 59f6e5f5761d3d6ebd7070e2e11d6d722522b1aa0daeba61facb045f9c6e420bba5f2e0187d89fb6d5cc4860653524665c02a4d69b06d6e20b52ac7f39fad251
 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.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
deleted file mode 100644
index 0aab745e74e0..000000000000
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune 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
-	prune_libtool_files --all
-}
diff --git a/media-libs/libpng/libpng-1.6.35-r1.ebuild b/media-libs/libpng/libpng-1.6.35-r1.ebuild
index f1f841336979..442c01532f55 100644
--- a/media-libs/libpng/libpng-1.6.35-r1.ebuild
+++ b/media-libs/libpng/libpng-1.6.35-r1.ebuild
@@ -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}]"