gentoo resync : 22.12.2021

3 files changed, 2 insertions, 54 deletions

diff --git a/media-libs/pnglite/Manifest b/media-libs/pnglite/Manifest
index 9304277523cb..23787bbda678 100644
--- a/media-libs/pnglite/Manifest
+++ b/media-libs/pnglite/Manifest
@@ -1,5 +1,4 @@
 AUX pnglite-0.1.17-include-stdio.patch 406 BLAKE2B 20f8f543906bf6c913b22de65c4ae1a1041fee3d674bf1f033b367021bbfbdb2fd5e10b9a9d62b5916791a77a6ad7523acef39d14690a9535af5bd5d6985c5e0 SHA512 96482d08c90ab90985c8694a99bf9ab1967a872fe32b441b3ac930a6af346f173859988132a339ed3e9b4935fbaaabc910276425955d8db20fa4f39b726a345a
 DIST pnglite-0.1.17.zip 6516 BLAKE2B 2c44855a5672bcbf633d600820f87f9f9ad42643bd0906fe62ed7c6da8b282d5c8adca684c828cc6064b1c6c02f3e7aca7a07df6c2317c674ed70ae577dacb1b SHA512 f728273a702287d1c299e2939a2e2da5a6c1fbc55372fe1869d7f93cfe59c016c9dcf02be0242c5fa77cda66b0016bbafe1b78f7a876ba2866c37f504d262ce8
-EBUILD pnglite-0.1.17-r1.ebuild 922 BLAKE2B 4cca0106d1cee5907027f01c1add80bbb44d45363c32c1b1c85ee3eef0aaf0b78ca5dd4fcc2e987ed8df95061ef8a48f9f55ffee14f3c3cda95c9a66c6c95a4d SHA512 66174057df302d11981ff7efd7b959e716cc1def066f0b65763f0a41acf42912835aeae31eab8ee8a7438f761592094a81ec29486c88f4833013757026f74762
-EBUILD pnglite-0.1.17.ebuild 1074 BLAKE2B 53f93b2b3707fb70c995d9dcb589f5bf560bd89d3717eb329da03e156e82ba5ff8faad552c4a50e6ec6b9a5ad8025d160785c729a8df43d4b45e605a0cefcad7 SHA512 8901996e379b76969ede359df34317c1f01fc6a6ae7597f50a019eefacc4d20df0d27913a84ddb01cab104c37be6c876bdcfaaac87fa30501f09fb76d1cd4def
+EBUILD pnglite-0.1.17-r1.ebuild 920 BLAKE2B 250007602b1ed74054b0f8eeb2bb4535979ca1411ce2cac3fd1312adf9d96654df25b3a0792eb3506d196d43cdfef4c36e7f415f35966da766f104045f2db06d SHA512 9513e754eefcfdcf602df3919a13a618e37e37f6f4c134a367fc605daf391bdb58b11c19b7817966740722251c320e5c5b656efd2d090b54a122bb5d7eccc187
 MISC metadata.xml 245 BLAKE2B a2d873aa3f0f9368560c1987ad3e2c8a8323bd1f5a0f235c6c981ad971c428484ad095a7e7c7bf3b5525c7bfa5e516cf12e29d651da8dca3f759d6516b9a6dcd SHA512 d1728fb91b8381e298bd2a6abf8819542fe34b1c0a0be44fd29706272909a357b39f417cfd9c0cb6ec3f258a1631bfdb5b129215471aecbe180d35f69186b558
diff --git a/media-libs/pnglite/pnglite-0.1.17-r1.ebuild b/media-libs/pnglite/pnglite-0.1.17-r1.ebuild
index fbbb21944154..c507663a4649 100644
--- a/media-libs/pnglite/pnglite-0.1.17-r1.ebuild
+++ b/media-libs/pnglite/pnglite-0.1.17-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.zip"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/pnglite/pnglite-0.1.17.ebuild b/media-libs/pnglite/pnglite-0.1.17.ebuild
deleted file mode 100644
index 054f83b18d30..000000000000
--- a/media-libs/pnglite/pnglite-0.1.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Small and simple library for loading and writing PNG images"
-HOMEPAGE="https://sourceforge.net/projects/pnglite/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-include-stdio.patch
-	sed -ie "s:\"../zlib/zlib.h\":<zlib.h>:" pnglite.c || die
-}
-
-src_compile() {
-	tc-export CC
-	if use static-libs; then
-		emake ${PN}.o
-		$(tc-getAR) -cvq lib${PN}.a ${PN}.o || die
-		rm ${PN}.o || die
-	fi
-
-	append-flags -fPIC
-	emake ${PN}.o
-	$(tc-getCC) ${LDFLAGS} -shared -Wl,-soname,lib${PN}.so.0 \
-		-o lib${PN}.so.0 ${PN}.o -lz || die
-}
-
-src_install() {
-	insinto /usr/include
-	doins ${PN}.h
-
-	dolib.so lib${PN}.so.0
-	if use static-libs; then
-		dolib.a lib${PN}.a
-	fi
-
-	dosym lib${PN}.so.0 /usr/$(get_libdir)/lib${PN}.so
-}