gentoo resync : 20.03.2021

3 files changed, 2 insertions, 63 deletions

diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index dc9686d47faa..f8de6d8cfaa1 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,4 +1,3 @@
 DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
-EBUILD optipng-0.7.7-r1.ebuild 1276 BLAKE2B eeb891d29b9c9d82e7c1c116d165fa2a25c2b9f33ff6f203f9ccb9d7b67ccef93479de68167dadbe759a4528a2cbdbebd5d53d5ff2a7e84e972d3b102c92ab64 SHA512 100d4f63355561d080ba04de7df9a1b8ad4e89145a458ac4363f1c94da78620df146206e5fefc7991f38ea3d355c69aa0cd4e7417b19be76d694034cf2df9bae
-EBUILD optipng-0.7.7.ebuild 1278 BLAKE2B 9a7a74a421262531b22ecc233ecb31a6aafe08594277f72c13d31397570f19d928b207be4badfd2b433c51f1f1cb5b66d99101369689156c620e02b6f07cc6a4 SHA512 592f16ca8af44761a574ae5dce71cc49f8bc05bb45fc815f1e74cc3105ab6fe428c151ecf9fd5fa1434e9a19b89816b64cef9e9c2742fb66c5deb0178a7b02e7
+EBUILD optipng-0.7.7-r1.ebuild 1271 BLAKE2B b6de3c8946621ad6a2bbeceeebf9162c63e65eb8689d6312447938efe8c025c56be5de8e518891c4a59c883aa6b4c71487d3eb29bfd821db3a239ef6c5b8d2e4 SHA512 d20427ac00acab76579f96fd120b0b27c7563949697effb6a61e891fb4e817fcd4a2d1dbec43bb2399f29e60f05b7363c3c7b1afd70b8aa3a541df3e6da9ef4a
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/optipng-0.7.7-r1.ebuild b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
index d09924d7eff8..7891be669fa5 100644
--- a/media-gfx/optipng/optipng-0.7.7-r1.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/media-gfx/optipng/optipng-0.7.7.ebuild b/media-gfx/optipng/optipng-0.7.7.ebuild
deleted file mode 100644
index 6afec58daccb..000000000000
--- a/media-gfx/optipng/optipng-0.7.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Compress PNG files without affecting image quality"
-HOMEPAGE="http://optipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-	media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	sys-apps/findutils"
-
-DOCS=( AUTHORS.txt README.txt )
-
-src_prepare() {
-	rm -R src/{libpng,zlib} || die
-	find . -type d -name build -exec rm -R {} + || die
-
-	# next release is almost a complete rewrite, so plug this compilation
-	# problem in anticipation of the much (c)leaner(?) rewrite
-	sed -i \
-		-e 's/^#if defined AT_FDCWD/#if (defined(AT_FDCWD) \&\& !(defined(__SVR4) \&\& defined(__sun)))/' \
-		src/optipng/ioutil.c || die
-
-	tc-export CC AR RANLIB
-	export LD=$(tc-getCC)
-
-	eapply_user
-}
-
-src_configure() {
-	./configure \
-		-with-system-libpng \
-		-with-system-zlib \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake -C src/optipng
-}
-
-src_install() {
-	einstalldocs
-
-	dodoc doc/*.txt
-	docinto html
-	dodoc doc/*.html
-	doman src/${PN}/man/${PN}.1
-
-	dobin src/${PN}/${PN}
-}