5 files changed, 126 insertions, 0 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index df5dd9e7bf5e..b7586984cabb 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 0a7a7dea700b..8b4219376b0b 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,8 @@
 AUX miniupnpc-2.2.3-drop-which.patch 1209 BLAKE2B 32ae4d0eee181cc428bc8afe6aee0ea6097527461c868b7133e1f1ab70c3aeb5c816b2297b8027db06fd9751e6ebf68e8bb560070e75987e72f7c3c60f61b7a6 SHA512 1e8d93c14d5b7f103782a15e007abd0e1223da60b98177d455ceb1a2c6fe5b7c3c22f2fe79da0b4dce54542ac6b3e8ec225d09a0b8bdf8742b07a14cd160b5dc
 DIST miniupnpc-2.2.4.tar.gz 102932 BLAKE2B ebfea3fe978280825b7beefb8fe799685a72b0a74c589f5f55c7fde3d8c0d4bbb3d50fa0ff3aed554fa1e24ada0a1ab578328373f0295020415998fe35cde0a0 SHA512 f6515bda86405114016474fef6332c0c09a56b9293cf4391113f549444bab67e7d031af7b94dacff5e7c96d6508527204498c00fb67d6067685ef606b2152595
 DIST miniupnpc-2.2.4.tar.gz.sig 543 BLAKE2B 14a1a1979e2d248bb721c66db3e28c1d6f970477e94235bdfa77763d5f9d4c0da42b23d026e861f48cc34a17e009bf8c57aacc648435ec9e31c3c4b6c3347ffb SHA512 476d1a6cfc519f82461bf4d516f73d40cc3ef27886da68d2e805a24d9c4609c53566e258bd2b622e7716f43c81c14bc0f01b189d23b46b87afc3c76d4e6fa23e
+DIST miniupnpc-2.2.5.tar.gz 103654 BLAKE2B 9cd3fee7bb4934610d57340d29ef61bbca8a94e230a0d35a26cfe4eec347f6807f7d5ab6edb38354ec82aa11bb7a83869169b3c322931f96a1e3a4dd6eec123c SHA512 32d362c43cf5c9f6c1546d85c2dd780f9701f3137bc78471b3670c4c0862b7fc4f081e6cb6fd14e5c0d3ec0602714756959491688998335c8a7b324e6c53aa2f
+DIST miniupnpc-2.2.5.tar.gz.sig 543 BLAKE2B ea7b5c254684f52485bc18ad4820c41e7c70a4eb5e552cb5f9d937a4927c9655a4fb959d32930299f1f863d4dbb5894ce76d693ce5a9996a44180038a02a0d5a SHA512 b23d35610d41c9dfc5af78de5329e9c28976685435bdff041759ab6e9f54154e7a082bcd313c682141fda8ba1e1c3b246e49109ad9a5323f003528d0ba71f880
 EBUILD miniupnpc-2.2.4.ebuild 1604 BLAKE2B 02ecd9ded80f1b5784d48b1afb832aa9450dba4752a30b4d46e52526c7feeddc7909f938a970db6921a3fe6fdadcb06e49ac80152188e34b500295a0b1089ee5 SHA512 a66bcc2fc2479a95fcebcefc781662016ea75db9fb1445324a2bef160ea6236567b8bd17af9d696e7babcf78f6fccd3895679cf00fdf08fac65c187a40ebbe0c
+EBUILD miniupnpc-2.2.5.ebuild 1612 BLAKE2B bf82f0a5954716d9f9176c7657abe8ffa63858f7a2b6d4fe718eb1df8fa6599e4bc60aa78fb83914e6979827f21f3881f32bf2ae5da4fc2433e280e4dc91f8c4 SHA512 e179d4376335001b9d078b5f0a5f48cf0c80d31a9c0efe5b8a74115f4ccb257d40aaba9d15e72eb377da27db6b6177061f5d0d161dfc6b790be53d7c64d25093
 MISC metadata.xml 330 BLAKE2B 02b7193f99aee0f3cad145954d1a6f7f9b2f63e21cc23d02ae3048d89618050a5a8df2e206d771a3d0853664d4a0de9a09f44660b108eb280618d9136d1c86be SHA512 6a395c2a579f4ce8c891261da25c031284904a8d6366733c14a201a948e6744ae0037067f178f799d6134e4be670f1be3582f257414e067de654e8050963b972
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.5.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.5.ebuild
new file mode 100644
index 000000000000..c45a1963b68f
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.2.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 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/
+	https://miniupnp.tuxfamily.org/
+	https://github.com/miniupnp/miniupnp/
+"
+SRC_URI="
+	https://miniupnp.tuxfamily.org/files/${P}.tar.gz
+	verify-sig? (
+		https://miniupnp.tuxfamily.org/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"
+
+BDEPEND="
+	kernel_linux? ( sys-apps/lsb-release )
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/miniupnpc-2.2.3-drop-which.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
+}
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index d82dfdcd3295..af5aad06678c 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -1,5 +1,7 @@
 AUX 1.8.0-replace-all-usages-of-inspect.getargspec.patch 1842 BLAKE2B eef46aa34262df0b7c08596c5040f4688508764cf07bfcefb4368c5cc4cbdf62542880a57c1d53e135d3b70ed3da24dc02225d520afb5972d55175c7930088d3 SHA512 d06d668303bb0b23c223c25d0978ed4573560870c9cb054509ca3244213c76257e165c2ea0789955e045f28067e09fc4833bcf4cbd714f3d7dd96d93a8e8e5e1
 AUX 1.8.1-Add-an-exclude-test-argument.patch 7797 BLAKE2B eff2398cf44ee619075be6e49c32d82f99715bfe542922eaa28dc8efd665686411c093174fb19aff084b2f4c25a16219006cf6bcf1396351148a3f737b81c9c4 SHA512 ef9f394be7069e13e303512a2ea73dfe628588f09123df7f72b4f32b17d1eb7d17a5801406f4167f630547adcd5bad84688b5a35471930ad02c70653ba87be87
 DIST stem-1.8.1.tar.gz 2859634 BLAKE2B f78da079791583a17eb439a4e2459c7e0af454e45300202df1085d1b1ba150ee097cfa1b93df5ad0d7090644fad6e035604382c73b94744076cad490ab52459a SHA512 bad2f4f96e37caa3ee2928bb027318c4941ca3f6c0072c5f6e87fe647d2b68400ad352d9c27fa2a35c00f4f327aa9cc00e2907b21a9cbd26fab46ec21e2a038a
+DIST stem-1.8.2.tar.gz 2859640 BLAKE2B 4539fc42a463cd1c2ebba10bb31a69d529c41cdaee623beebd3219a2c1d59f8f9b8242b537dd4244e666fb765c5af2729caeeb22a7f8cd1ca6c13dd3cf6aac93 SHA512 f054bbc9a61e04fb7e3b7d1534803b938b855c29795471953661f8fd9c0a5196fe1f9ccfd01e5b3256ea42893a7d57fda34fa54932012e345f74bb3303ff98c5
 EBUILD stem-1.8.1.ebuild 1482 BLAKE2B 74799c4c26538e682a771e321515cd228e866ab7448e65672bbc3a90675de3be49b34122f11cd10f1c348e467241102b741ad309451676d3c9a53975d61fb486 SHA512 920e1ca2e66d0a70180d7eebbb06ddd56bb69cd37a2154c09c5c056e2f5b595b54acc23f3b45a6859e5e893880573d4d6dd95438fc11b687501082ef83c0a85f
+EBUILD stem-1.8.2.ebuild 1616 BLAKE2B ba9e3f46768c53d061dcb658792a553acc03cf46a3f24e10b49b58c69a37a89f24a078925b079d2d835d3539689a507536a138acc52e72fd79b12cb9a20c30e6 SHA512 903c8cae8cc4694bc64eb139bb852b75eb20cca40f7044b09efcb1e35b406f1271e324cf148f40cf90e7eba39fd3f0a697007efd7387dc7ba57ff483a2beb1fb
 MISC metadata.xml 297 BLAKE2B 9da181ceb341f1e4c5bf37cbcc8f40536c237a20095b4ffc0553996a4cd5d24ccb2b85d248f654a36757a4db5154335949f298a09df7e3d63c3cf74f38253788 SHA512 1400ff80faae768418f7c2e246c09e36a1ea0d66b686adf3251b4b7a57930ad39e935912a539ef3b3c9316f686d7c1191658a28188f3eb1b90ed1a07e7751c77
diff --git a/net-libs/stem/stem-1.8.2.ebuild b/net-libs/stem/stem-1.8.2.ebuild
new file mode 100644
index 000000000000..8cfdad4fb4db
--- /dev/null
+++ b/net-libs/stem/stem-1.8.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Stem is a Python controller library for Tor"
+HOMEPAGE="https://stem.torproject.org"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="net-vpn/tor"
+BDEPEND="test? ( net-vpn/tor )"
+
+DOCS=( docs/{_static,_templates,api,tutorials,{api,change_log,contents,download,faq,index,tutorials}.rst} )
+
+PATCHES=(
+	# https://github.com/torproject/stem/issues/53
+	"${FILESDIR}"/1.8.1-Add-an-exclude-test-argument.patch
+)
+
+python_prepare_all() {
+	# https://github.com/torproject/stem/issues/56
+	sed -i '/MOCK_VERSION/d' run_tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local skipped_tests=(
+		--exclude-test test.integ.installation.TestInstallation.test_install
+		--exclude-test test.integ.util.system.TestSystem.test_expand_path
+		--exclude-test test.integ.control.controller.TestController.test_get_listeners
+		--exclude-test test.integ.control.controller.TestController.test_get_ports
+		--exclude-test test.integ.control.controller.TestController.test_getinfo_freshrelaydescs
+		# confused by exception text change for JSON parsing
+		--exclude-test test.unit.descriptor.collector.TestCollector.test_index_malformed_json
+	)
+
+	# We use --unit --integ to avoid the static/style/lint checks.
+	${EPYTHON} run_tests.py --verbose --unit --integ "${skipped_tests[@]}" || die "Tests failed with ${EPYTHON}"
+}