Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

5 files changed, 42 insertions, 82 deletions

diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest
index 50b6b2ffd1ed..7a10f0068e89 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -1,9 +1,10 @@
 AUX gif2png-2.5.11-makefile.patch 968 BLAKE2B ccc9c0955d105a6be48bd5e761304c11d451b8e0afcdbe60c168cc7f530041140e78b10c63a8791a74ce736f888e9be511ef63d2037304551f5fd368ee11ffd6 SHA512 d5d10837171ebf0db971a3a0513e34f94b4a070f4cf61dcb38b3e301edb7d151c2965e2bf483dd6a0631fbc98d621a4b02f53aac6bed8ed85549dc12b7423756
-AUX gif2png-2.5.12-makefile.patch 1049 BLAKE2B bbf558d2fbfeea6ea5c4b8bc863541f2118d93994b78d80390cbad4179d739e2a547a06359a13d0e2a0c2b9dd056a62e0a7a954043e69ea35a57e6082c1bba9e SHA512 1c0278626ead4640eeae69408020007fcc96fd6078fe6abcc5ab81c1fec2a89eb8ccdf134bd22c8b4e26abfe390aded4fda3a9d9ccf600e2128bcf1ebcaef735
+DIST gif2png-2.5.10.tar.gz 138944 BLAKE2B bb299a4a00920f2979455f63e8c0cdedd4046fd3cf726cf30bc73ab476277002a828f7c1f59e2292f08d53742038c11ded13d8b9f1fa7bc2c7e07b25cb3cb120 SHA512 3ca1c0d41a38b4b628f929afa231b8f67079f9998210e63b68e4438379a5d70b64d332f7e0786fb199ef866e188f5095c0d0d4570ec9da829aeac63c8918ad3e
 DIST gif2png-2.5.11.tar.gz 31507 BLAKE2B d35c1afc8dc790fb99ee819495eb41ac6d0555d14c12707c0f844a33f631d7d6e074776b8f51b1439b0b0ee608f67622d92de761f42e44e2974b24f47ad0db0c SHA512 c7e42aca45f941bca970ff14f49881f485c4dee18be448ae71aa7c80dabd9384bcba6d6de05a0a78757150b3e775d99df315231ddae8e32c91c08f1c9cfefb67
-DIST gif2png-2.5.12.tar.gz 31613 BLAKE2B 8614d3e0435bab334465d3f43d8676a80f1041e6cd5572fb525295c00d9027b505741331bd3df452d55e8f49893ab611832f2d4d150794d268a436a04f5f20b2 SHA512 481775d0efc65e0606a60546ed2a1e4a976587ca1a406620f8ea9126b32dc810d3b549cc99ba33ff9f88379de2ce47a799840b92978ee621bd18d3ae08b2c6a8
+DIST gif2png-2.5.8.tar.gz 128373 BLAKE2B a8b374661a03cdaaabe0a534f5fcbe1c56f40bb74cdf73bfe2a7b8f4fdbc2ac078bdd30a9232795ee804963bed1a36ec5d81e7494595de644591f6b4f855fefd SHA512 050c516c125efda315e6bc7e4fadcdd612a9596bd1e6f611865a457efb06153a45516eca343422e15ad75b1219f82ec855f03781285df411590008f5a67e0554
 DIST gif2png-2.5.9.tar.gz 137750 BLAKE2B a5fb0570f6263c1911a4cad52f1b974f8010a02cf882f2e1e40ed7dbbce4be8b75290e4b0a78b5dde74cc244c9a848dd429a937e696746d3d39b8cec9dd469fd SHA512 0632f1b4b96a1e4b5567101fbac36db55e658503977c8c875d75d9c1db5b374deba5afbda5507585b6b79242781fd70afc477e686458cc124adb8e1b29860c1e
+EBUILD gif2png-2.5.10.ebuild 476 BLAKE2B 4720d8061e93f87f241d981c3c5fd116df76ae4a5f876e4029868b374219936de4b526d1c923730565eb8d80d67988bfbb8d7a64a63bd994424d88f9217651a6 SHA512 5e94bc0156e9e0c21c12b1998c63fc1731db0501eb4b6e65286cadf4b3f6cacf40d4df9f7bea78a258affcd0cd2b25157344900f1bd6ce9970e8e5a1ac9be040
 EBUILD gif2png-2.5.11.ebuild 620 BLAKE2B f7db5fdcab6140e9d69e2e9a55a52f14b0374a978a0023c492aa3255120775102c64f9f1ec8d4071418dcb6110aa7a55be2208f6d389f062a733b3baacc31823 SHA512 b6b173a8a3cb48eba996253cc28eb7835d902e13db7f67c55f6e6634a27ca81a3e850eee322508e21d8127fbcfef34fe437e743a036513e4af2f363e41a8b5c1
-EBUILD gif2png-2.5.12.ebuild 824 BLAKE2B 9102092ff19c7f7c8e2628a1d93699c628202e50f0d587a2c05bf0c6dbe7cbb51f524403435552ca08b3c98a6666822eda153e363514a73a01f99bfdf9702a6e SHA512 22fd274b541e4779a990009a3365a830f85b26835385c1ece11a3cf266474b90bdab477bd73e15a91e32c5c947565c7519bfc3dba00d1fe87639a06f1e740ca1
+EBUILD gif2png-2.5.8.ebuild 472 BLAKE2B 082fe78d6b0aaeb507e7d3d8e2693e93d8de888da1b0d1fa52e0f45164d53c0c7b98fe534a70377353db38f31c80a5ea4d93fb6e98c45c27bb7d4d6b9e2170f1 SHA512 7e71654906afee75a3b094ed796ccdba126b1e8c635bbd65ed018222be651a65fd5cd2ac84346beb0d2fbb305f7c8040f5dccb553ffbbcb0b80b3fcc74249daa
 EBUILD gif2png-2.5.9.ebuild 472 BLAKE2B 7e87e3e7bcc682a9d0642882312fce3c9cd70a47a427be947989cad1fe66f49fbb82404b417c8388c60cc4bd313a4ca6a94062a430ee465403f1ad0031e31734 SHA512 e3fed27af7cd3ccfbe2ee618a547fc3a7a5729cef1fa48798a9f8001de6b08a23ce67a239cf33b96ff8a41a49e2941c1f68e93271de626a7a605813ac6745d8e
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch b/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch
deleted file mode 100644
index e99180f8686e..000000000000
--- a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Respect CFLAGS/LDFLAGS/DESTDIR and don't try to run missing tests.
-
---- gif2png-2.5.12/Makefile
-+++ gif2png-2.5.12/Makefile
-@@ -2,8 +2,7 @@
- 
- VERSION = $(shell sed -n <NEWS '/::/s/^\([^:]*\).*/\1/p' | head -1)
- 
--CFLAGS = -DVERSION=\"$(VERSION)\" -O2
--LDFLAGS = -s
-+CFLAGS = -DVERSION=\"$(VERSION)\"
- 
- SOURCES = 437_l1.c gif2png.c gifread.c memory.c version.c
- OBJECTS = $(SOURCES:.c=.o)
-@@ -28,22 +27,19 @@
- web2png.1: web2png.xml
- 	xmlto man web2png.xml
- 
--check:
--	cd test; make --quiet test
--
- clean:
- 	rm -f gif2png *.o gif2png.1 web2png.1
- 
- version:
- 	@echo $(VERSION)
- 
--prefix?=/usr
-+prefix ?= /usr
- 
- install: gif2png gif2png.1 web2png.1
--	mkdir -p $(prefix)/bin
--	mkdir -p $(prefix)/share/man/man1
--	cp gif2png web2png $(prefix)/bin/
--	cp gif2png.1 web2png.1 $(prefix)/share/man/man1/
-+	mkdir -p $(DESTDIR)$(prefix)/bin
-+	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
-+	cp gif2png web2png $(DESTDIR)$(prefix)/bin/
-+	cp gif2png.1 web2png.1 $(DESTDIR)$(prefix)/share/man/man1/
- 
- uninstall:
- 	rm $(prefix)/bin/gif2png $(prefix)/bin/web2png
diff --git a/media-gfx/gif2png/gif2png-2.5.10.ebuild b/media-gfx/gif2png/gif2png-2.5.10.ebuild
new file mode 100644
index 000000000000..6d952faaee56
--- /dev/null
+++ b/media-gfx/gif2png/gif2png-2.5.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Converts images from gif format to png format"
+HOMEPAGE="http://catb.org/~esr/gif2png/"
+SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.2:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README"
diff --git a/media-gfx/gif2png/gif2png-2.5.12.ebuild b/media-gfx/gif2png/gif2png-2.5.12.ebuild
deleted file mode 100644
index 937a694a8ebb..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=media-libs/libpng-1.2:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.12-makefile.patch
-)
-
-src_prepare() {
-	default
-
-	# this release lacks the NEWS file that is being used to
-	# query the release version
-	# https://gitlab.com/esr/gif2png/issues/4
-	sed "s@^VERSION.*@VERSION = ${PV}@" -i Makefile || die
-
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-}
diff --git a/media-gfx/gif2png/gif2png-2.5.8.ebuild b/media-gfx/gif2png/gif2png-2.5.8.ebuild
new file mode 100644
index 000000000000..e3d4326da751
--- /dev/null
+++ b/media-gfx/gif2png/gif2png-2.5.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Converts images from gif format to png format"
+HOMEPAGE="http://catb.org/~esr/gif2png/"
+SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=media-libs/libpng-1.2:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README"