gentoo resync : 18.11.2019

3 files changed, 2 insertions, 60 deletions

diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index e70a6e1ea4ee..27ccd0d3a1aa 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -8,8 +8,7 @@ DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5
 DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2 SHA512 d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3
 DIST giflib-5.1.9.tar.gz 385068 BLAKE2B 0c6765eb9a017fee8de28c9440434f3054f87ae65139a3f9f4a41145d4d86dfbd88ece54ea6f40c58054e0ab728a1d346c2f725843bcc34bfd75825e58b8f650 SHA512 b6350b39755e3eeba58b5fccf319bbaeee2db6564e13c8ce44d3652cc32d243c391def74b6b1529bc5e0d4573eff94b2ffa5faa90fc564a049122d3e23f1d184
 DIST giflib-5.2.1.tar.gz 444187 BLAKE2B 8c1e105bbb65dc7ab103976caed70834356440f381ec5118311882fb1c558bb65f6c1081e5767f9835087860de44df5dfcd2826f89744dded548d535736f27f0 SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
-EBUILD giflib-4.1.6-r2.ebuild 1361 BLAKE2B e86a7bd6b59ab7cbb83b97429087231e45d7161ddaa8b4dabbbc44ae62981147c455481170a125d9130571ce2c487969aeda3a19a6981067482dec13cb8f8cca SHA512 bea6bfe10ef247cdc4af4d3db04e4d5efaa9bbce91019c1bffa9dd8081c127af231b7243983d3a3cef58d7616ddefcd7303e59b7ac09419b5f6fbf70c3e20e70
-EBUILD giflib-4.1.6-r3.ebuild 1460 BLAKE2B 21b67902f8006966732c2641b23523b70c27a874bb235d667836a558147b4de5f8f8b5465fa42cbccbb92d1c3a9a07eb91a76ae4d7adc7644c0c083b0414f90d SHA512 73aa3bff51380ffe17e65979fda115a136317313f9a298b1c2bf9962be5ddc564d7b899c1de510f815ffa9f3769cdc2be2601cb6a2a278b1468e7c37b8b279d6
+EBUILD giflib-4.1.6-r3.ebuild 1457 BLAKE2B e61692e026885c84372598dac86642176d1e2d361ee41954c122b0ed33ad563e734a280b5cd5bf4702f05ef538969ee13d24b93dd8ef46a6a9f506d1e1e781aa SHA512 992b4a14584aac4cf154921fc36f6493a96d061e6e290f82d37b911f88f0178f89eb04cd974629825c702a09d286c7d97555748c49260036c987ad7842a857b9
 EBUILD giflib-5.0.6.ebuild 1038 BLAKE2B 5a6c7ae4f88624995c3fd518eac4ea512ef0646c1b9e345ba44a0e6b3f9f3ee9bcf826c49f615eac1e507c4f4b9ecfb80e307dc5dad7d3b30f50c07b792b83e8 SHA512 99d325391763ba015c2b27173cff64c91cd8fc401c6e5d977bc966ab8d60d303eb2ba9dfdf13354822df3b56bacc7b52299052dc8aa99f734bdf3c033d022a17
 EBUILD giflib-5.1.4.ebuild 1368 BLAKE2B 485f64770f0e384adb3750a6c0272f475f37a8c16487ecb6d593e267aa5a462e79e6457cd0f39cb131a7eb9430d595b2064fcdebaded78484bd25c65bcab9334 SHA512 023b996bcf47bbe3350de231fe2aedf36a2c68655d44ad5afbd155b3e8b672d64bb83d3cb2623a5f37f58d45c691c89bbf9a3831c7677d1318d1740383ceb5fa
 EBUILD giflib-5.1.8-r1.ebuild 1853 BLAKE2B 677f21d9ef26c558242aa93ef640a96f5d4123e787b9f03d7a2e8080853e10649d84cd51896a8f1a95f3445dcc61dcc39b58b486552954e09c3f7c54f3e43b99 SHA512 7bfd62190a45aa343b8ec80f3d5a36cdebd270de1d8b9a89d98b7e4eff9e9f1a26b66f7a8fa46b5976f80db4f97af91a20588c9668dd2eeac2042805bd4bfaa1
diff --git a/media-libs/giflib/giflib-4.1.6-r2.ebuild b/media-libs/giflib/giflib-4.1.6-r2.ebuild
deleted file mode 100644
index d26ea7adbd53..000000000000
--- a/media-libs/giflib/giflib-4.1.6-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit epatch epunt-cxx libtool
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="https://sourceforge.net/projects/giflib/"
-SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="rle static-libs X"
-
-DEPEND="
-	X? (
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libSM
-	)
-	rle? ( media-libs/urt )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gif2rle.patch
-	epatch "${FILESDIR}"/${P}-giffix-null-Extension-fix.patch
-	elibtoolize
-	epunt_cxx
-}
-
-src_configure() {
-	local myconf=""
-
-	# prevent circular depend #111455
-	if has_version media-libs/urt ; then
-		myconf="${myconf} $(use_enable rle)"
-	else
-		myconf="${myconf} --disable-rle"
-	fi
-
-	econf \
-		--disable-gl \
-		$(use_enable static-libs static) \
-		$(use_enable X x11) \
-		${myconf}
-}
-
-src_install() {
-	default
-	# for static libs the .la file is required if build with +rle or +X
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt
-	dohtml -r doc
-}
diff --git a/media-libs/giflib/giflib-4.1.6-r3.ebuild b/media-libs/giflib/giflib-4.1.6-r3.ebuild
index c64647f31a60..4fc4d01d0925 100644
--- a/media-libs/giflib/giflib-4.1.6-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="rle static-libs X"
 
 RDEPEND="