gentoo auto-resync : 29:07:2022 - 21:08:17

3 files changed, 2 insertions, 66 deletions

diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index c57e89cfab93..80af14e285e4 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -2,6 +2,5 @@ AUX miniupnpc-2.2.3-drop-which.patch 1209 BLAKE2B 32ae4d0eee181cc428bc8afe6aee0e
 AUX miniupnpc-2.2.3-makefile.patch 2179 BLAKE2B 38854b992d62f219394fae19d5038dcc2f9c2249184cbeba3a4c0948a61ca2147ae2cb7df2d19e38f76e3f6bedcec8e4ffa80d6685fb2f360fc36b8590399e1b SHA512 b332363db1e8df16a86153748a69ee5499a115df215d46cc3d2012e26574991a9545e81ce966f0b051f69601639dddde10a632555075c92c06d132624936a28d
 DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
 DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
-EBUILD miniupnpc-2.2.3-r1.ebuild 1545 BLAKE2B 8f0182cb4c1ecf2317b3e883d90f35d3fe1fc1a6b161514b2f4ff4145d7eb9f36dc6c915b7a716d3bcd78f8ad0205f3cc2eb6afb93a85cbab25a1a55ed85958a SHA512 30b085a96e22066cd11692cfe17698cca2b88d3b6e3acb65443dd12d5031233d7552218372d522490fd29044aef79b0e547349d83d6543514248bc417b8fe158
-EBUILD miniupnpc-2.2.3.ebuild 1521 BLAKE2B 066d26958db1796f5566383fbaf99a1ff837c2d3267cb8062b3a09c222984876ab0d96ee6181860b6cecaec3dfdafac2596428e017217a79851a557059bffa63 SHA512 bface54f8a84857ab38898a9db0eec8f97063765a06e5d856d3c55de11b3eed3b2aff6473f5cc60dd0eb5f014e31fea5ceaab865c0a9678e09fbd534570848bb
+EBUILD miniupnpc-2.2.3-r1.ebuild 1544 BLAKE2B aa215b5a60e3e1ec4bcca653b61937f3b6bdc98cbaf16b076f6b843c51c6d0c06e359b0c4d91e7abaaabaf99069d2913a381ccad0750193d6a917560b36fa97a SHA512 4f11ec9894ca27552b6753f2b735d41f69f8c2474a604cc3613478b72ecd33912b4f12a43797afcd75cc6878396e29dfb08ffa0d8bdf388d9160a41f4425d5f1
 MISC metadata.xml 330 BLAKE2B 02b7193f99aee0f3cad145954d1a6f7f9b2f63e21cc23d02ae3048d89618050a5a8df2e206d771a3d0853664d4a0de9a09f44660b108eb280618d9136d1c86be SHA512 6a395c2a579f4ce8c891261da25c031284904a8d6366733c14a201a948e6744ae0037067f178f799d6134e4be670f1be3582f257414e067de654e8050963b972
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild
index ae6258202316..d4182dc8183b 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ipv6"
 
 RDEPEND=""
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
deleted file mode 100644
index eb241b980d00..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
-	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="ipv6"
-
-RDEPEND=""
-BDEPEND="
-	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-	verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-makefile.patch
-	)
-	default
-
-	local exprs=(
-		# These bins are not installed, upnpc-static requires building static lib
-		-e '/EXECUTABLES =/s/ upnpc-static listdevices//'
-		# Prevent gzipping manpage.
-		-e '/gzip/d'
-		# Disable installing the static library
-		-e '/FILESTOINSTALL =/s/ $(LIBRARY)//'
-		-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d'
-	)
-	sed -i "${exprs[@]}" Makefile || die
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake build/upnpc-shared
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}