gentoo auto-resync : 24:06:2024 - 00:11:52

24 files changed, 407 insertions, 88 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index fd09cee78902..d04d8e83bbac 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gensio/Manifest b/net-misc/gensio/Manifest
new file mode 100644
index 000000000000..46dfe30dd00c
--- /dev/null
+++ b/net-misc/gensio/Manifest
@@ -0,0 +1,4 @@
+AUX gensio-2.8.5-install-dir.patch 656 BLAKE2B 342788bf6eaa8e6f4e04cdb8112d81e098e4f63c5782d1583156dd80e8e80cd3d27cb2b808731d712519c2a1b0e811c3f08acd9583a4de003e186e904a108404 SHA512 4e5c7b30c6c7c5aa65fd6ffdce05765d61190e3612beeadd1a37982ea34c9d5c655f94067ca567daa055341cd46c241b933c1a2e99e6e33fcde6ab44266f2868
+DIST gensio-2.8.5.tar.gz 1550476 BLAKE2B 4a000101a31ce0e1b9ee47e786a3a552b5b2e5863de67491bcfea0a61e55132220b5a62c6e40bb17aeae66ea57b651611e776b1446c6b1c3ac74452238295d95 SHA512 820bceca89085f830d0bdf05147ffa591f63a635311757d0af22a5a0284065e9b50e3bb4bea64bba1114c563e448d11e7f425c311b8f577d7f0f2d17944c9549
+EBUILD gensio-2.8.5.ebuild 1464 BLAKE2B 31b8cd606577d0ddb7c533fa817eeec2b19a852393101a5b7e324d3e65812985b63effb302929709103fd5a83ffdcc0b5affe20d383647957f7ca92de7adca18 SHA512 718776584738e39a3b85ef32973246c3986755b5043c7a7131a442a3cb42100f8ce15013fe55408e9e60eb11b411050e40e269daa5d285b021b27eacf2c3dde2
+MISC metadata.xml 512 BLAKE2B d4edf70d5238afadc071df0004d98acb9807c90a4d6e550e951ae0e8b2bee137ffe0d1e5953ae6261ca463774f3fd9d076439ef075631e780b5d8a20a05a3583 SHA512 0c37c3af17ccf246838db73e489b7560a0f75bdc9041cbbf31d05cdf45ce6bdcace11ece27c039d90bd191e1c4f6fcb650ff22688f5d80c75c197cb9a19841d9
diff --git a/net-misc/gensio/files/gensio-2.8.5-install-dir.patch b/net-misc/gensio/files/gensio-2.8.5-install-dir.patch
new file mode 100644
index 000000000000..ddea0cb55402
--- /dev/null
+++ b/net-misc/gensio/files/gensio-2.8.5-install-dir.patch
@@ -0,0 +1,16 @@
+--- gensio-2.8.5.orig/lib/Makefile.am	2024-06-18 21:45:20.427838306 -0700
++++ gensio-2.8.5/lib/Makefile.am	2024-06-18 21:46:09.360860952 -0700
+@@ -385,6 +385,7 @@
+ endif
+ 
+ install-exec-hook:
++	@(install -d $(DESTDIR)$(gensiolibexecdir))
+ 	@(cd $(DESTDIR)$(gensiolibexecdir) && $(RM) -f $(gensiolibexec_LTLIBRARIES))
+ 	@(cd $(DESTDIR)$(gensiolibexecdir) && $(RM) -f $(xgensio_libs))
+ 
+@@ -392,4 +393,5 @@
+ # libtool will not remove the .so or .dll files since the .la file is
+ # no longer there.  We have to do that by hand.
+ uninstall-hook:
++	@(install -d $(DESTDIR)$(gensiolibexecdir))
+ 	@(cd $(DESTDIR)$(gensiolibexecdir) && $(RM) -f $(xgensio_solibs))
diff --git a/net-misc/gensio/gensio-2.8.5.ebuild b/net-misc/gensio/gensio-2.8.5.ebuild
new file mode 100644
index 000000000000..738d126edafe
--- /dev/null
+++ b/net-misc/gensio/gensio-2.8.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+DESCRIPTION="General Stream I/O"
+HOMEPAGE="https://sourceforge.net/projects/ser2net"
+SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug tcpd"
+
+DEPEND="
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+# Test suite requires a kernel module
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.8.5-install-dir.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-file-stdio \
+		--without-link-ssl-with-main \
+		--with-uucp-locking \
+		--with-flock-locking \
+		--without-broken-pselect \
+		--with-pthreads \
+		--without-glib \
+		--without-cplusplus \
+		--without-python \
+		--without-go \
+		--without-swig \
+		--without-all-gensios \
+		--without-moduleinstall \
+		--with-net=yes \
+		--with-udp=yes \
+		--with-sctp=no \
+		--with-stdio=yes \
+		--with-pty=yes \
+		--with-serialdev=yes \
+		--with-telnet=yes \
+		--without-tcl \
+		--without-openipmi \
+		--without-ipmisol \
+		--without-mdns \
+		--without-dnssd \
+		--without-alsa \
+		--without-winsound \
+		--without-portaudio \
+		--without-certauth \
+		--without-udev \
+		--without-ssl \
+		--enable-doc \
+		--disable-internal-trace \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/net-misc/gensio/metadata.xml b/net-misc/gensio/metadata.xml
new file mode 100644
index 000000000000..846d0822488b
--- /dev/null
+++ b/net-misc/gensio/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+
+	<longdescription>
+		A library to abstract stream I/O like serial port, TCP, telnet, UDP, SSL, IPMI SOL, etc.
+	</longdescription>
+
+	<upstream>
+		<remote-id type="sourceforge">ser2net</remote-id>
+		<remote-id type="github">cminyard/gensio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 556517d2091e..6f71ca21ef80 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -4,6 +4,9 @@ DIST miniupnpd-2.3.5.tar.gz 261952 BLAKE2B 022ddbc495a2dbb500ab54a3c0569a16acf37
 DIST miniupnpd-2.3.5.tar.gz.sig 543 BLAKE2B 17394e1da7d95c89771dd7578e4f1e2ce407c04b142f44fe4f110beff908797991553a7275c3ba28df03b09877963d16092cb718d4c75d96211db07226bcb176 SHA512 ef21f493da56b9f3fe99003ee299c08b13ddcf433d7136222817ff2e1c775bf7c28cbb47ef3ab60c662380e585c2be0ca4c38e261697de410f5a751c1f4fe2da
 DIST miniupnpd-2.3.6.tar.gz 263018 BLAKE2B 9e3d6bfdbe71a09a15bf11c1a718b1388db991de52a2ec742aaec70128e4ac5147f441ccfa50e7077f09682ac724040343c4e351b4cc8c3d9e8efe04773651ec SHA512 41ed8d0afcfdba70ab5ec44a33ad4643b226bea2da972fc432035fd3ff3a790227a71c32ca47574558e36eb491b0f6ab7710d3ef0af5ac6a359d899dcb36893c
 DIST miniupnpd-2.3.6.tar.gz.sig 543 BLAKE2B 5c5c3566a9dfd16d95ca70fa006f7ce7097aebfe76940c03c22047064d5dae92aed73062f2455f08b61a99a747f9615e72c06e178628d948532b987b40fb262f SHA512 312a9db9cbd74912294a7cc2d4ccc69634806fc58702083fda56e11ad1fd978e92ad71f217cadf5f4482e8e655df07e6d7cc52ae494b8167140ae4db74cd352d
+DIST miniupnpd-2.3.7.tar.gz 265329 BLAKE2B 9d7cbe04644c6811950328f402e4666fc8d51cf022a3ec40e4cc76c0f8a1c89b6703fe4ebe8d5eca7f6cef20acad7efbc47503dad4391d1519a6774ae6b26afd SHA512 7409bd6777c2a572ea501d47be604d9b09c09b1451c0f4150acd2313e3a5b4f7f3567559324a6c634c11a2b7c0ff56886a85217d1b056d5402916d0a8a3408e8
+DIST miniupnpd-2.3.7.tar.gz.sig 543 BLAKE2B 957b5dad44b020004a38b6f4748ca251deaadfc8ade28332eb12484e4bac408f5afdb38fe9974f18bc17a28dd33aae91a287838c7c15984bc5df7f69a82f9c6f SHA512 b8edd3f69b61e63560fb902f43e0a1730c80908637978782a1141fe8ac910b24f578ee3980127f4726c44e44222491a83670adea36a19984b3ffd726b12fe0dc
 EBUILD miniupnpd-2.3.5.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
 EBUILD miniupnpd-2.3.6.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
+EBUILD miniupnpd-2.3.7.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
 MISC metadata.xml 985 BLAKE2B 4df9a4cf573d7aa45b80bc5062682325c3e063fd4b6147164dcc2a4e1b859def25df4541e1859c8843153c9de3a74557a3b66c94b69a65a94162752e177a907e SHA512 2068b103e2804c899ab17f63ae0aaf46442252067d6a8c12e7cc94c0b8760f5d764cf4124be78079236611cd05d7c5016b1b08499d1c265c561193344dfdeba6
diff --git a/net-misc/miniupnpd/miniupnpd-2.3.7.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.7.ebuild
new file mode 100644
index 000000000000..ef90208e7b6d
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.3.7.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6(+)?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+BDEPEND="
+	sys-apps/lsb-release
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc
+
+src_prepare() {
+	default
+
+	# fails without a default route
+	sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die
+}
+
+src_configure() {
+	local opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+		--firewall=$(usex nftables nftables iptables)
+	)
+
+	# custom script
+	./configure "${opts[@]}" || die
+	# prevent gzipping manpage
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_test() {
+	emake CC="$(tc-getCC)" check
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest
index e026b99031b9..34d0748348e3 100644
--- a/net-misc/ser2net/Manifest
+++ b/net-misc/ser2net/Manifest
@@ -1,5 +1,9 @@
 AUX ser2net.confd 879 BLAKE2B 41e159da088c7db25415da24f545435e4e1ee94af9f922ddb3accc392a5fd9ec0517e79a6a37d9dcfae6911739306e02711580ce1c0059fb1f5e38495ebe929b SHA512 15054f7aa604f93bd5a54c2bb96c9a3168905be5ace50bcd2ebeeaf9dc9ae19426388e6118e9e4850125349090ee29542c24487e64c349593a76366be4a5e501
+AUX ser2net.confd-r2 676 BLAKE2B 2446bea3d565ceccea3e9f86a36606fdea6084285175282b96b93cc70223d388cf3bb3d37226877f0193a660c776210f7b65032e9fa5957f7c4bf21e8fa039fc SHA512 0a03fecc44c2b1cf4208914d2e4cea407d494caa0461fdfe95f6a3fdeaa3dbcec84d7537062e0c4261621f8720f31013262963b4764e41088200984f5e6222cf
 AUX ser2net.initd 1251 BLAKE2B a22c21a2807e9c6c9e6ec19869b0de3871514c6cd38c36e0713ca93d392d56966e9ef63655afe7b2e86affa4c1dc0ee4837381cfce8c1b8cea980d7d23d0f51f SHA512 f92c39a2f54f04c31ff12c6bc92b86eb6b884e790e9856b15ce3d8f2db1f43c8084437f91ccbe259fc989deac462575cbe16a4ce5059f29857bd04258b6e6aee
+AUX ser2net.initd-r2 1053 BLAKE2B 77ee4ae2728b9d010a1e155b8e33fd3d42aa72a79a61c0a7a2a87474f0523179dd147d4b070698a869f87931c454ac21b0f3aa465e4a663d64823be74047cf12 SHA512 7e4f7e2c7c54ef194741ad78b3b0a1358107241f6352d6e3cc0f7bfdfe3042d4dfbddb165d729aafda41de5ec56e2760ae9727707d91d4d1be720511e2e561b3
 DIST ser2net-2.10.0.tar.gz 364322 BLAKE2B db041297069ea0a111ed73d6b1fc8a639971f113952fbcd499a81671bbd873ee3e1724146bfb5c6975d1812acd8e545e9df2bde445f4a86af57a0ae5b9b19ec1 SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10
-EBUILD ser2net-2.10.0-r1.ebuild 633 BLAKE2B 716fc276a41dd9268b5458348a64fcd032b7f266992ad91b25de78e173f429d93d52ce575d1ce907f00ab89cff0473f3264c7a40dbb5b7ec155413190e08c1f9 SHA512 10c2a69459f8f80de29b7a49f6c245c30408a94f0de46b73bd7e456a3ddcf91fe9e9d7b97cb944c079fc973e62cf20b02f0ffae3616e550ca31f16e8fab7fb10
-MISC metadata.xml 245 BLAKE2B 283e669c2eaccbce6c5325e25d008486a91fee37eea3825d95b9659ba080b98865682e7713d1f2ccfb0b9fc4f1172dea97b8adf709582101ebe3b1dffb20f3da SHA512 01f6412344b7d183c04fe517d920e61d02ae502d820d2c41f49d3d4bdc9d76cf15429cf1dddbea33bb9d8a0c70cf2cc20d2d9a751258c41d1fe1a9aebd690ec4
+DIST ser2net-4.6.2.tar.gz 474345 BLAKE2B b495628f7aeda3804c43e59f76a54bfb872551011ccf338a81dc4ed92fa89b36a7356f45b5d4d6804969505eb90b117a348c7a2f78e08a4ed08c730c58df2e40 SHA512 3bd7ceb743f1503c055e0c206cfd2b987fee8ba532683a8470c7c078134b68d115809ef94c38fe926ff29363930e014d9cc9a44cc32a8ed93559e193a13204f8
+EBUILD ser2net-2.10.0-r1.ebuild 633 BLAKE2B 4503c978024a14dd77232baede1bc681ba4c6c4cfe11522876a4e16df02958220b9a377db67a0405f73269d9984e1e6614efb11a3663d012258b9c6264c96884 SHA512 c4af45699f87da83f0647491bcef499c12f9da62f680ff168aaf217a57d89a6d78be0ea4c0b97dcdda547624fda2e83dacf3eba2de4c0189af6b6cffd69678f2
+EBUILD ser2net-4.6.2.ebuild 704 BLAKE2B c3d856fb6c4bd8bf20f4c8c7bd8b44e016790b45c05049e626bc838a08b2fbc2718f460246cf29286652782e7a0425485903e8d26b90d7a7365187c819588e88 SHA512 525c7c0b24542ef555fba54128c8127b97cda1e904dc2588522e151c0afd1b0c54b156edbbd1fe00e7d60c1c308c13671a198c25156ba9174f8c040da6da8f72
+MISC metadata.xml 539 BLAKE2B b3effcbfadd7b46f80e3e3f5eea5c6a5f09af3861ea24b91b41d71d28c651610f57d7edd81f46430bbc8d5ec16bdb604dc4661b4fbb31b09c918a8b8cb4cb215 SHA512 bb16fd9b94c07662c71d4d3668c56ede92afc95fbe7efaadd6f9380f39d459b59d653b0dccf6539b9655bf468c22de59aa54317c36c2aa4e32b20c9d36369637
diff --git a/net-misc/ser2net/files/ser2net.confd-r2 b/net-misc/ser2net/files/ser2net.confd-r2
new file mode 100644
index 000000000000..a443ce752a75
--- /dev/null
+++ b/net-misc/ser2net/files/ser2net.confd-r2
@@ -0,0 +1,21 @@
+# Config file for /etc/init.d/ser2net
+
+# Set the configuration file to one other than the default of /etc/ser2net/ser2net.yaml
+#
+#CONFIG_FILE="/etc/ser2net/ser2net.yaml"
+
+# Enables the control port and sets the TCP port to listen to for the control port.
+# A port number may be of the form [host,]port, such as 127.0.0.1,2000 or localhost,2000.
+# If this is specified, it will only bind to the IP address specified for the port.
+# Otherwise, it will bind to all the addresses on the machine.
+#
+#CONTROL_PORT=""
+
+# Enable or disable UUCP locking (default=yes)
+#
+#UUCP_LOCKS="no"
+
+# see the ser2net(8) manual page for additional options you can configure here
+#
+#EXTRA_OPTS=""
+
diff --git a/net-misc/ser2net/files/ser2net.initd-r2 b/net-misc/ser2net/files/ser2net.initd-r2
new file mode 100644
index 000000000000..0321e8a9bbb6
--- /dev/null
+++ b/net-misc/ser2net/files/ser2net.initd-r2
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Serial to network proxy (${RC_SVCNAME#*.})"
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command="/usr/sbin/ser2net"
+name="${description}"
+
+extra_started_commands="reload"
+description_reload="Reread configuration file and make the appropriate changes"
+start_stop_daemon_args="--quiet"
+command_args_background="-P ${pidfile}"
+command_args_foreground="-n"
+
+depend() {
+	use logger
+	need net
+}
+
+start_pre() {
+	command_args="${EXTRA_OPTS}"
+	CONFIG_FILE_DEFAULT="/etc/ser2net/ser2net.yaml"
+
+	yesno "${UUCP_LOCKS:-yes}" || command_args="${command_args} -u"
+	[ -n "${CONTROL_PORT}" ] && command_args="${command_args} -p ${CONTROL_PORT}"
+	[ -z "${CONFIG_FILE}" ] && CONFIG_FILE="${CONFIG_FILE_DEFAULT}"
+	[ "${CONFIG_FILE}" != "${CONFIG_FILE_DEFAULT}" ] && command_args="${command_args} -c ${CONFIG_FILE}"
+
+	return 0
+}
+
+reload() {
+	ebegin "Reloading ${description}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend ${?}
+}
diff --git a/net-misc/ser2net/metadata.xml b/net-misc/ser2net/metadata.xml
index 1fe9d8c02aa9..72212e7f69df 100644
--- a/net-misc/ser2net/metadata.xml
+++ b/net-misc/ser2net/metadata.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+
+	<longdescription>
+		Serial to network interface, a proxy that allows telnet/tcp connections
+		to be made to serial ports on a machine.
+	</longdescription>
+
 	<upstream>
 		<remote-id type="sourceforge">ser2net</remote-id>
+		<remote-id type="github">cminyard/ser2net</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/ser2net/ser2net-2.10.0-r1.ebuild b/net-misc/ser2net/ser2net-2.10.0-r1.ebuild
index 72d5a604c80c..a4441cf96772 100644
--- a/net-misc/ser2net/ser2net-2.10.0-r1.ebuild
+++ b/net-misc/ser2net/ser2net-2.10.0-r1.ebuild
@@ -4,12 +4,12 @@
 EAPI=8
 
 DESCRIPTION="Serial To Network Proxy"
-SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz"
 HOMEPAGE="https://sourceforge.net/projects/ser2net"
+SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz"
 
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
 IUSE="tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
diff --git a/net-misc/ser2net/ser2net-4.6.2.ebuild b/net-misc/ser2net/ser2net-4.6.2.ebuild
new file mode 100644
index 000000000000..3fd27c27be52
--- /dev/null
+++ b/net-misc/ser2net/ser2net-4.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Serial To Network Proxy"
+HOMEPAGE="https://sourceforge.net/projects/ser2net"
+SRC_URI="https://downloads.sourceforge.net/ser2net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam"
+
+DEPEND="
+	dev-libs/libyaml:=
+	net-misc/gensio
+	pam? ( sys-libs/pam )
+"
+RDEPEND="${DEPEND}"
+
+# Test suite requires a kernel module
+RESTRICT="test"
+
+src_configure() {
+	econf --without-sysfs-led-support $(use_with pam)
+}
+
+src_install() {
+	default
+
+	insinto /etc/${PN}
+	doins ${PN}.yaml
+
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 1722a284b452..9fe77359f475 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,9 +1,8 @@
-AUX streamlink-6.7.2-validator.patch 2637 BLAKE2B 91b6c0f12b584c0908f0d4092d87cb50feefbdc3ff563d7585c5713547ffbb54614b7970435664d3a0cae7c1b7ae69edaa7bd15ff19a4169c9bc5ff02f0edfe5 SHA512 fe9d12e5d7bbdee7f778ac344494ec0fca6489509a92627b6305b425d1f594337a8b495c61c87f90356a9aaf97996b6b9b2b804f1b08f1ca3358ad2dec1cdea8
-DIST streamlink-6.7.2.tar.gz 741037 BLAKE2B b6ecea883a8b09e524a28ebdee083bb5f1e563605ef16fb3adebba03194ad3f1d8f9dc902cfe80372dc53c5778f1ddc9695680b5cd4a87277b646fc15fffd7e2 SHA512 251e0b03c39dae980367e8a5b6ffcb1c279b0874eeaeff31d9d4486917b759ef27ba2bd5bba0bc74691237e429981f3748002e0ef49befe8c7be69160856ecfe
 DIST streamlink-6.7.3.tar.gz 742832 BLAKE2B 5f03a036c3f2170d25e43618f36d7b937e8063f15a965f45d8cc6033b49899b15c19af23aa2a845f8aec74341932721b792dad6bff70400f0dea24a19f1415ed SHA512 0955faab177bcdd0f66500f837124bf0f426829cb5c847fa18bb85aa3fcd7c27a750bab13f3e247b5187e9561713330b582b10729d82984d98081856e976ae65
 DIST streamlink-6.7.4.tar.gz 744387 BLAKE2B bd8fb9af560fbe164a63fd1b698100765c716b44b6f3364e6ad072f69d0fdee9d22dd0fda6c297f249915c9a60f10e2089228a8c19244a7ef18b5809632bf96a SHA512 266c66626624814d708a228d4e2e62c443c3973fb139632a88086619c755fa80d97fad077a2a7383f9beb3e2f4464274beb0bb446b85f6f63d6704a88a9c2e29
-EBUILD streamlink-6.7.2-r1.ebuild 3586 BLAKE2B 84da1643f580ee83c3c21d10ea05938c8f19508f0174d7c078712df5f6e87974935ca102d409158c76d326079f23aa03a1090fd61e567072672fe8a78d22126d SHA512 8b35abad170e51449321c60d238dc956fd9f567ec0342ad10da21f2e1d7671379f8523d227bc1d5b544815fbc7ba258638dc9c49c94eb476da26f7050cbda6a5
+DIST streamlink-6.8.1.tar.gz 748765 BLAKE2B bf42375bc37432c66e8d2c9d8c3b31cfbda8c990bc4d7b83970198c4f60b5dc30d5ce3daf339bb842bc058955edff55df16da4f4cc0362410eaaff1bb6d74e28 SHA512 51cb03ca2414ec64f95704833568bb48aaae458e77f6ef3f4d858b564908cff4944c07a0b4d3bb648a0fe2bbb6a43a7964333878e31aef0b2a6ff3b9048b8e1d
 EBUILD streamlink-6.7.3.ebuild 3511 BLAKE2B dbb535f5f5379b3c4fdc8d63782a517631764df5381cdbad9ddac1279670b174f2b90ce71b8640a51ddc1f4e58feddbdcb5e929d16efd232a83a38da475d9a4b SHA512 e8d23d97c4333ad15590fba842174a9ce91901ca76491e9cafd8517584c9e52df40ba99b24a1282abaa7fd55b83e66d17f707050ba6061511ebad791159c9fa3
 EBUILD streamlink-6.7.4.ebuild 3467 BLAKE2B 86cce8c49e044677799d05283a625b9255bb7a8f87df22dc95481a65cef2db6f863f1263a01c84240c59cd85bc3830d75ac6a31c018f9c23ea708c39973647d6 SHA512 6544c612555ba1d853adac93114be7093ac3d33443ab4bcdb272c64e9e3f85d3a644dbab5708d652bf128f7d3fa8ebb3a4ed9b88de8a904ed173e27b1fe0728e
+EBUILD streamlink-6.8.1.ebuild 3467 BLAKE2B 86cce8c49e044677799d05283a625b9255bb7a8f87df22dc95481a65cef2db6f863f1263a01c84240c59cd85bc3830d75ac6a31c018f9c23ea708c39973647d6 SHA512 6544c612555ba1d853adac93114be7093ac3d33443ab4bcdb272c64e9e3f85d3a644dbab5708d652bf128f7d3fa8ebb3a4ed9b88de8a904ed173e27b1fe0728e
 EBUILD streamlink-9999.ebuild 3467 BLAKE2B 86cce8c49e044677799d05283a625b9255bb7a8f87df22dc95481a65cef2db6f863f1263a01c84240c59cd85bc3830d75ac6a31c018f9c23ea708c39973647d6 SHA512 6544c612555ba1d853adac93114be7093ac3d33443ab4bcdb272c64e9e3f85d3a644dbab5708d652bf128f7d3fa8ebb3a4ed9b88de8a904ed173e27b1fe0728e
 MISC metadata.xml 398 BLAKE2B 43aa67d43256cecb95b788e4bab999f73b7b624fa1af0432aa87ffa94071f09e29eab6733468d6607eeb7aa9f81030610dfbcd849f9cb9196d80181ea5712f74 SHA512 2db05f8a1196e44e632b4ee1d85f804d295eb53141cf176e85cbe90cc30e0fee382a5e798e4cc7fd63557d60687d05a671533c2188a2fcf497f6e95292190149
diff --git a/net-misc/streamlink/files/streamlink-6.7.2-validator.patch b/net-misc/streamlink/files/streamlink-6.7.2-validator.patch
deleted file mode 100644
index 8dc69d62616a..000000000000
--- a/net-misc/streamlink/files/streamlink-6.7.2-validator.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://github.com/streamlink/streamlink/pull/5932
-https://github.com/streamlink/streamlink/commit/0466622dc0bd13db972f6a00d2e2bda31ad50229
-
-Quoting the PR:
-"""
-Since Python 3.11.9 / 3.12.3 / 3.13.0a6, urllib.parse.parse_qsl() now raises a TypeError
-if the input is not a str, is truthy and can't be passed to memoryview(), like integers for example,
-hence the test failure which previously just checked an invalid input to that validation schema.
-"""
-
-From 51c13ddd45f83384cf7800a881127ad74dec3bb8 Mon Sep 17 00:00:00 2001
-From: bastimeyer <mail@bastimeyer.de>
-Date: Tue, 9 Apr 2024 21:36:03 +0200
-Subject: [PATCH] plugin.api.validate: check parse_qsd() input type
-
----
- src/streamlink/plugin/api/validate/_validators.py |  6 +++++-
- tests/test_api_validate.py                        | 11 +++++++++--
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/streamlink/plugin/api/validate/_validators.py b/src/streamlink/plugin/api/validate/_validators.py
-index 69135b74919..e99d305733f 100644
---- a/src/streamlink/plugin/api/validate/_validators.py
-+++ b/src/streamlink/plugin/api/validate/_validators.py
-@@ -651,4 +651,8 @@ def validator_parse_qsd(*args, **kwargs) -> TransformSchema:
-     :raise ValidationError: On parsing error
-     """
- 
--    return TransformSchema(_parse_qsd, *args, **kwargs, exception=ValidationError, schema=None)
-+    def parser(*_args, **_kwargs):
-+        validate(AnySchema(str, bytes), _args[0])
-+        return _parse_qsd(*_args, **_kwargs, exception=ValidationError, schema=None)
-+
-+    return TransformSchema(parser, *args, **kwargs)
-diff --git a/tests/test_api_validate.py b/tests/test_api_validate.py
-index ceff9bc1dde..c328116d27b 100644
---- a/tests/test_api_validate.py
-+++ b/tests/test_api_validate.py
-@@ -1343,13 +1343,20 @@ def test_success(self):
-             validate.parse_qsd(),
-             "foo=bar&foo=baz&qux=quux",
-         ) == {"foo": "baz", "qux": "quux"}
-+        assert validate.validate(
-+            validate.parse_qsd(),
-+            b"foo=bar&foo=baz&qux=quux",
-+        ) == {b"foo": b"baz", b"qux": b"quux"}
- 
-     def test_failure(self):
-         with pytest.raises(ValidationError) as cm:
-             validate.validate(validate.parse_qsd(), 123)
-         assert_validationerror(cm.value, """
--            ValidationError:
--              Unable to parse query string: 'int' object has no attribute 'decode' (123)
-+            ValidationError(AnySchema):
-+              ValidationError(type):
-+                Type of 123 should be str, but is int
-+              ValidationError(type):
-+                Type of 123 should be bytes, but is int
-         """)
- 
- 
diff --git a/net-misc/streamlink/streamlink-6.7.2-r1.ebuild b/net-misc/streamlink/streamlink-6.8.1.ebuild
index 73d54972af03..6d9015879476 100644
--- a/net-misc/streamlink/streamlink-6.7.2-r1.ebuild
+++ b/net-misc/streamlink/streamlink-6.8.1.ebuild
@@ -26,20 +26,21 @@ fi
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 # See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep
-# See https://github.com/streamlink/streamlink/pull/5895 re exceptiongroup dep
 RDEPEND="
 	media-video/ffmpeg
 	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+	' 3.10)
+	$(python_gen_cond_dep '
 		dev-python/certifi[${PYTHON_USEDEP}]
 		|| (
 			dev-python/chardet[${PYTHON_USEDEP}]
 			dev-python/charset-normalizer[${PYTHON_USEDEP}]
 		)
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
 		>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
 		dev-python/isodate[${PYTHON_USEDEP}]
 		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
@@ -73,14 +74,10 @@ if [[ ${PV} == 9999* ]]; then
 	"
 fi
 
-PATCHES=(
-	"${FILESDIR}"/${P}-validator.patch
-)
-
 distutils_enable_tests pytest
 
 python_test() {
-	# Skip tests requiring <dev-python/pytest-8.0.0 which is currently masked
+	# Skip tests requiring <dev-python/pytest-8.0.0
 	# https://github.com/streamlink/streamlink/pull/5901
 	EPYTEST_DESELECT+=(
 		tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception
diff --git a/net-misc/sunshine/Manifest b/net-misc/sunshine/Manifest
index 32f2c1cc4630..4a4a52230830 100644
--- a/net-misc/sunshine/Manifest
+++ b/net-misc/sunshine/Manifest
@@ -2,6 +2,7 @@ AUX sunshine-0.22.0-nvcodec.patch 1009 BLAKE2B 4a2fd3dbd98b64fd6e259c94d218f9853
 AUX sunshine-cross-cbs.patch 2020 BLAKE2B b57c6fe66707a86b35a70945ca9b9da9c4e8bb0bba8bd0d66e9ec9e3d15121cc4a193b56ea376ff3e244d652c18ac7504d687cefd54876afcf3cb54d8024c71b SHA512 95710af147509f8c93c875513c01a596fd62fe421495395dfeef41a6230d031e779277a9a2604c4d5dce788d6ecf77e667942d3ae2d6e675ef29db86e6519734
 AUX sunshine-custom-ffmpeg.patch 7668 BLAKE2B 2fa8adf912791e8abf73f0ea173228318edb804584c1efbe15077d6b6e08f7e6cfaa4dacf5e02115325ebe9a0ef09b9e49d3e021d6220dff0b364c1bbcd0b7e4 SHA512 ace6b855edf21a91958d843bff730634c585a96c1f728c304e7b79ddacc96fdb767936fd5d8dd8f2df3347d12a25519e9d1511ada3828404b9440d8333bfc013
 AUX sunshine-find-npm.patch 3778 BLAKE2B 9862cb4f8926438a588275446d02a84e0341dcafacf7037338151eb0e3020a89aa8f583d52efcebca032fd8f87b12ff6f6545f288ae1431f84efd9bc6b381d18 SHA512 4ed7da0be9d8608e71fd17b8af7ef159920d9313278c0f7f21390144b510dbfa0b2a4433bca5664e507c6210e1f032c5c014448e85a44eba891df71fc316c2b9
+AUX sunshine-miniupnpc.patch 1564 BLAKE2B fdf74035a9fe5d8e696b57bc924dfcff226151f4561d6fb814996a7c972196022a765483cb01f77a4dbf435fc9fbcfd193cec497a172ba55fbe4374dcbde0ee7 SHA512 9c804e1e8386b058c01e6034ae9b4fc4ddc2336aebc858562f6c1d6a5bee36c37ebd3382c8fc37441db55916665f37678503a0749892a6416035d4c449468a5b
 DIST LizardByte-build-deps-2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec.tar.gz 24171 BLAKE2B bcc8f1829eae4ba85a9cbdaca7876a4a52c979f3b8ef0f0a56876fcb171025544bd1997455c2b8fff59564deca433366ae03f14cbb0929f78c87f991b269156f SHA512 892184ec0ff321b2b7e2000dc605d1162955cb04ff259f6032f124f1ff50a1fe485e2cf2c0b735788f8615c9aba87ca040205599cb4b91881daa462a53340bd7
 DIST LizardByte-tray-4d8b798cafdd11285af9409c16b5f792968e0045.tar.gz 1068346 BLAKE2B 6da778c6dc1efb1147363de239a4170dad23288322285b847ed86837b316162bce861b848b8371ea8562efbfa0d36dc6921e8a36da0a05740e3f6aa1da29fae1 SHA512 9c6535a6a3ba4489b5af0821a8c42bbb706259c10d70237bd3d3b31283a7e8ad0e3c2326a34c229d899389156909c36252a931ea47eef8daeb8b7c54b26e92cb
 DIST Simple-Web-Server-27b41f5ee154cca0fce4fe2955dd886d04e3a4ed.tar.bz2 63258 BLAKE2B e80a6cd92825038ca75b973281b676584f9e488b45b1f9c6ed526236c0a7188b97ae2bba9d7b5557893452dd1ba8778faff2ade840cc169d20b4cf0e51fc8394 SHA512 2eba1d8bd53bb3e29e51a72000918b44730f73b4df26824f25cb6a4860dd21f8aaa7f77124fb500ffe9601ebeca66d1c21a06cad239ed27481e9cae088afbd44
@@ -12,6 +13,6 @@ DIST nanors-e9e242e98e27037830490b2a752895ca68f75f8b.tar.gz 194694 BLAKE2B 1effd
 DIST sunshine-0.23.1.tar.gz 24503568 BLAKE2B 0c589f38a7d638c49af6385def2676de04af422f85d37228988bd7c822ffc006dbac0a1695e01527ac7a1d5ee28103cff00d78a97d57f61247772a6e6cc1fe18 SHA512 7a9150baf4ecdad1035666993c60744390e227ebeaf467447c53675dc0aecc7031cd9c9b253fbbbbac072f5592c3690c6acfde41f38d441497a17157417f1e16
 DIST sunshine-assets-0.23.1.tar.xz 1269348 BLAKE2B 36dd00fbf4bb1bfa213d53fd9dc78ed1fee9e12efcfb138dbd54932c3f19447d832da506175a982be7564408e06b0699b0b7cb4b9811ab81b47e30681c915bab SHA512 9fe9e0ee29864faa0f67dd4d501d116be1476f2c7ec688646b91eb87cb38e9e9d2baecb8335df29075fd3f60bf05b900c20dcb8406306d68a62c30ff55d1b7aa
 DIST wlr-protocols-2b8d43325b7012cc3f9b55c08d26e50e42beac7d.tar.bz2 19708 BLAKE2B fe20f21ee8282d7afcdbb8f3863e50b217fb71e7814f404f288b0d09d30c9e30135769b12342d9e9126a8cb2ab35d6ced0c5562807d274b1d97224f5f3d02511 SHA512 7935b5089820304aa8cb0e1a8f4e0db6ccd5285973a3f3554ccc935dd88e379eb03c3b2dd199da97b6ff8dfbbbf124ca65fb1c12821a168d34bd7e26d8514edb
-EBUILD sunshine-0.23.1.ebuild 11943 BLAKE2B 4c9dfbf39d87da8cec615660c9d4c315a28692faed80bd67da952d3d6beeb2dc5a82f41277e37d712d9069384300a20ba5a7c3ecc3b74ab7b64ad1a87178d774 SHA512 bc5a654cec73c65b89b3c76eef78751de45711c91c47d0e1d4ede52ba31eb59fb91ce12778781ebd9de58bf29ab12194cd0d61d06a9922f2d7b7988899da4a4a
-EBUILD sunshine-9999.ebuild 11866 BLAKE2B e263814754a6c873c8a3d5f72776518ce4637c0db84368c0ab050a969cce1c2325a574b41f1c9ebc4aebaedc81cde5b612626695a79e91fe6e6802d44d40ca01 SHA512 493d72e6bfe1e9fc394921ffd702239385f2595e35387a5a92bc4d7debb84dba13791c81149b1493debf9c115d401f2e4ed74aecc0131ab58b283037ba7502d3
+EBUILD sunshine-0.23.1.ebuild 11980 BLAKE2B 037183be75c94168a3a673562e2d6058fbfe0a32f0c746e9ff315bbcd2fe38a5eaef62f024021b0f0a8bef79f2020e66c9159ad88876934e7e28a2184a19b792 SHA512 0c4f2190a1833b71885049bd598ce2b328149a0b2f22043ed420c39ecf98be4211377a16810b31216a21e0b55eb1b6c12a7f47f4b76a530c5d2cf1c8203e20a5
+EBUILD sunshine-9999.ebuild 12219 BLAKE2B 653b583a1a3f13f50d0b8c8f9fd1302bca376c1868648006e3d6f9b75db594defc73356b6db8113037b34e1d4a7970e25cabcf24bca124c2da1b5829e58bc31e SHA512 dc7027069b5e499e9ad0ce7740468cad05394feeb52b8d284f5a855881b11ec3bef6cd464ca629c36c373d6b26368e310bea756f0f3976cd53d237cc873a06b4
 MISC metadata.xml 880 BLAKE2B 656a3a283ae7504498d1a67cc343cfa614e21e0422c1076781164822809079eafe8e514d01182e977f7add5a28c4e7e09db985c8e4ea551eef1a1f92609488d9 SHA512 679f3c676ce568e8c0a8b816463c66d69055d0dba740c9065ce8feb36335981df65fff9d47f35e93f6b60337cc59f3da6ec3b83f9bb01905c73f912b50a0366d
diff --git a/net-misc/sunshine/files/sunshine-miniupnpc.patch b/net-misc/sunshine/files/sunshine-miniupnpc.patch
new file mode 100644
index 000000000000..3847724eedc5
--- /dev/null
+++ b/net-misc/sunshine/files/sunshine-miniupnpc.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/934173
+https://github.com/LizardByte/Sunshine/pull/2746
+
+From 850f656676d30ffb47028e865982e56be161d179 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 23 Jun 2024 16:21:23 +0100
+Subject: [PATCH] fix(upnp): Support miniupnpc API version 18 (release 2.2.8)
+
+---
+ src/upnp.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/upnp.cpp b/src/upnp.cpp
+index 2743ebae..e6ec057b 100644
+--- a/src/upnp.cpp
++++ b/src/upnp.cpp
+@@ -109,7 +109,11 @@ namespace upnp {
+       IGDdatas data;
+       urls_t urls;
+       std::array<char, INET6_ADDRESS_STRLEN> lan_addr;
++#if (MINIUPNPC_API_VERSION >= 18)
++      auto status = UPNP_GetValidIGD(device.get(), &urls.el, &data, lan_addr.data(), lan_addr.size(), nullptr, 0);
++#else
+       auto status = UPNP_GetValidIGD(device.get(), &urls.el, &data, lan_addr.data(), lan_addr.size());
++#endif
+       if (status != 1 && status != 2) {
+         BOOST_LOG(debug) << "No valid IPv6 IGD: "sv << status_string(status);
+         return false;
+@@ -331,7 +335,11 @@ namespace upnp {
+         std::array<char, INET6_ADDRESS_STRLEN> lan_addr;
+ 
+         urls_t urls;
++#if (MINIUPNPC_API_VERSION >= 18)
++        auto status = UPNP_GetValidIGD(device.get(), &urls.el, &data, lan_addr.data(), lan_addr.size(), nullptr, 0);
++#else
+         auto status = UPNP_GetValidIGD(device.get(), &urls.el, &data, lan_addr.data(), lan_addr.size());
++#endif
+         if (status != 1 && status != 2) {
+           BOOST_LOG(error) << status_string(status);
+           mapped = false;
+-- 
+2.45.2
+
diff --git a/net-misc/sunshine/sunshine-0.23.1.ebuild b/net-misc/sunshine/sunshine-0.23.1.ebuild
index f700216a63b6..d197b35c6616 100644
--- a/net-misc/sunshine/sunshine-0.23.1.ebuild
+++ b/net-misc/sunshine/sunshine-0.23.1.ebuild
@@ -179,6 +179,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-custom-ffmpeg.patch
 	"${FILESDIR}"/${PN}-0.22.0-nvcodec.patch
 	"${FILESDIR}"/${PN}-find-npm.patch
+	"${FILESDIR}"/${PN}-miniupnpc.patch
 )
 
 # Make this mess a bit simpler.
diff --git a/net-misc/sunshine/sunshine-9999.ebuild b/net-misc/sunshine/sunshine-9999.ebuild
index daa9608b1d60..fc9ced64a545 100644
--- a/net-misc/sunshine/sunshine-9999.ebuild
+++ b/net-misc/sunshine/sunshine-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 # These don't necessarily have to align with the upstream release.
 BUILD_DEPS_COMMIT="2aafe061cd52a944cb3b5f86d1f25e9ad2a19bec"
 ENET_COMMIT="04e27590670a87a7cd40f5a05cda97467e4e25a3"
+INPUTTINO_COMMIT="8a33706a146787a1ed3666ce52888634dd16cb86"
 MOONLIGHT_COMMIT="cbd0ec1b25edfb8ee8645fffa49ff95b6e04c70e"
 NANORS_COMMIT="e9e242e98e27037830490b2a752895ca68f75f8b"
 TRAY_COMMIT="4d8b798cafdd11285af9409c16b5f792968e0045"
@@ -28,6 +29,8 @@ else
 			-> LizardByte-build-deps-${BUILD_DEPS_COMMIT}.tar.gz
 		https://github.com/cgutman/enet/archive/${ENET_COMMIT}.tar.gz
 			-> moonlight-enet-${ENET_COMMIT}.tar.gz
+		https://github.com/games-on-whales/inputtino/archive/${INPUTTINO_COMMIT}.tar.gz
+			-> inputtino-${INPUTTINO_COMMIT}.tar.gz
 		https://github.com/moonlight-stream/moonlight-common-c/archive/${MOONLIGHT_COMMIT}.tar.gz
 			-> moonlight-common-c-${MOONLIGHT_COMMIT}.tar.gz
 		https://github.com/sleepybishop/nanors/archive/${NANORS_COMMIT}.tar.gz
@@ -123,7 +126,7 @@ REQUIRED_USE="
 "
 
 CDEPEND="
-	dev-libs/boost:=[nls]
+	>=dev-libs/boost-1.85:=[nls]
 	dev-libs/libevdev
 	dev-libs/openssl:=
 	media-libs/opus
@@ -208,7 +211,7 @@ src_unpack() {
 
 		local EGIT_REPO_URI="https://github.com/LizardByte/Sunshine.git"
 		local EGIT_SUBMODULES=(
-			third-party/{moonlight-common-c{,/enet},nanors,tray,Simple-Web-Server,wlr-protocols}
+			third-party/{inputtino,moonlight-common-c{,/enet},nanors,tray,Simple-Web-Server,wlr-protocols}
 		)
 		unset EGIT_CHECKOUT_DIR EGIT_COMMIT EGIT_BRANCH
 		git-r3_src_unpack
@@ -222,6 +225,7 @@ src_unpack() {
 		find moonlight-common-c-${MOONLIGHT_COMMIT} "${S}"/third-party build-deps/ffmpeg_sources \
 			-mindepth 1 -type d -empty -delete || die
 		ln -snf ../enet-${ENET_COMMIT} moonlight-common-c-${MOONLIGHT_COMMIT}/enet || die
+		ln -snf ../../inputtino-${INPUTTINO_COMMIT} "${S}"/third-party/inputtino || die
 		ln -snf ../../moonlight-common-c-${MOONLIGHT_COMMIT} "${S}"/third-party/moonlight-common-c || die
 		ln -snf ../../nanors-${NANORS_COMMIT} "${S}"/third-party/nanors || die
 		ln -snf ../../tray-${TRAY_COMMIT} "${S}"/third-party/tray || die
@@ -332,7 +336,10 @@ src_configure() {
 	CMAKE_USE_DIR="${WORKDIR}/build-deps" cmake_src_configure
 
 	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DBOOST_USE_STATIC=no
 		-DBUILD_TESTS=no
+		-DCCACHE_FOUND=no
 		-DCMAKE_DISABLE_FIND_PACKAGE_Git=yes
 		-DFFMPEG_PLATFORM_LIBRARIES="$(usex svt-av1 SvtAv1Enc '');$(usex vaapi 'va;va-drm' '');$(usev x264);$(usev x265)"
 		-DFFMPEG_PREPARED_BINARIES="${S}"/third-party/ffmpeg
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 805d8934995c..4106af17e53b 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -2,7 +2,7 @@ AUX wget2-2.0.1-stdint.patch 573 BLAKE2B bd2f85fc234a6d019c10212bee2c636c9b42847
 AUX wget2-fix-build-issues-with-clang-16.patch 841 BLAKE2B 055c0e61566fa78360481f618dbcdc5fd65f853c94ac4b5d1e75e43a5be9b6295e9281c632635405eec840a79b6d106b30bf068d7577f21d8d087f6b102f39f1 SHA512 59c95329ee7f779be169c2a9032a36dd49e8c596967ba3a6d0dc12ba3cbd67dab8acccabff7d73126232ee60b699b84ee95253c17b39b47e049134b86700608a
 DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e856fce02690e40ab0818d213bd656de704bd6310650af7190d7d3265fee859eebab326ad441f7351213fce6d3 SHA512 7a4afebf87ecda9e7e2d1fb2861c220875a96bab7c7ead6397c7ac11b6effae80d80f71b57a58d6b91a6c849b9a9fd974ce620d3050f677dd0fc4bc05358b27e
 DIST wget2-2.1.0.tar.gz 3867884 BLAKE2B 4bde0b8d8d703f863db10dccdcafe9c93923a6861b973607f7ec2c06fa68921561b41eb049e59ccab4f0abafe5017e15d4131d684ad47b4fa4f6ac38c8772ed2 SHA512 ae1fc267b1c2ee182ee59f0fc34fef238326a20f1ea1c15be6db2c16b70d49e89f61ca937d3e64d214f73ef9646ba4318782ac4210db51bd3d89c55ce4406872
-EBUILD wget2-2.0.1-r4.ebuild 2099 BLAKE2B b1243ee3033e70e94d099325ca876e168298db7e7a884361a66fcab87693b89b9628691b6395e176bbe9146bb0403b5d3d285e5db215daca026b0ae4aa642e72 SHA512 5f2848b599e8ef34dc1f29d76843332ea4c4a6afecc01b5ecdba0c3bc26f770a2a6b7f3cce28a12103830060bcf082df5413c9c5ce924e3db64c586a3bf286e4
-EBUILD wget2-2.1.0.ebuild 2002 BLAKE2B 31d45d1c577bdef1b4d1fe769297bdc7de3f2ce64dfeb811717cba1f8e501e35a5633ebbf8ba14e14d2fa3516cfca53ee3e97052abdb5ae366f2a134f0e9d875 SHA512 a0c25f07d7fd0494667fd161f461a61825af75dc1a08d6179cbce805f9f3a733fbccd7833d02b333d46a90527ab68e8207652bd15b3aa3b373cece1bd284122b
-EBUILD wget2-9999.ebuild 2459 BLAKE2B 06427b66e5d28a8b6bd84858878d325ce23f37a47fa3c54bc2c14adb04be55aefea4fe22a84a8bede55ea31ef5b85e36cc809f88dc112f820211adadce6d39ba SHA512 33eda01f7e1a3fec32eccf460655d34f09a63b5c19065d406bc426125c9ca1d15a4fb22cd1d695ee812bd8c13cdce82296abb9c9edde759b9cfaf2c24f0c3799
+EBUILD wget2-2.0.1-r5.ebuild 2101 BLAKE2B ad5a9b30d712ff74aab2341b64acad027c331f968f284959bf4efd2126eae7b09ada5686991415169475e1eb1ca8ad3f63c2285c082982d192566ce7fc30cf42 SHA512 8ed0502c73d3e4da18cb5431305b7f213b0ff718d4afe65d3bf186506696debe429fe6f767e754096dcb5a341f2b66eb26ca5662fd56d4627649a48e52154317
+EBUILD wget2-2.1.0-r1.ebuild 2004 BLAKE2B d5211b88e52e3079711720979fccb0a8a59b4fcdb22b219cfb1a5d97723ace8cf91c412b6706b54e0708fb400bcf1be124ed53c89e80dd6b28ad80991dbfab35 SHA512 f7b31a8d372e129a862a5467509e3c971b72a69b17599156c780231ffc3278b28417c2efbb0827beb832c9cfeb27be42227f7697ef5b3520f25e1bb77e4348ad
+EBUILD wget2-9999.ebuild 2461 BLAKE2B 722cd2ecf7ac287d0acb11fa227ee61e718079f5aefb1502cd9554776b5edb240200e4ef4373aca1e827d069848a62836c75373761ac8cd175578394379e16bc SHA512 a231dcdaac8af0f470d1eb54cf5197b0196af4c5ad3e13b2def37ed1d6eb5e52e80dbf760fe372aebd578bed5fb24510be4080b20ea9dae95350e1d0e9f97b1f
 MISC metadata.xml 579 BLAKE2B c79af69ebc4c7486e50182bb2b30883f31243de3b125ef1e152118141989dbcdf64a9e04c8879d05690821fb333583f6a1387198b30ee02be8d9483c6545daff SHA512 d07b10702ee8e38700e171f628a95f4b24748132f8372f9595fbc85345d7e96066c1494a3d216d3428679d52ed2e3a3c0fa50b1e5c41286d0f31348c6646ad9b
diff --git a/net-misc/wget2/wget2-2.0.1-r4.ebuild b/net-misc/wget2/wget2-2.0.1-r5.ebuild
index 56d044188f55..9d777020a981 100644
--- a/net-misc/wget2/wget2-2.0.1-r4.ebuild
+++ b/net-misc/wget2/wget2-2.0.1-r5.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	)
 	gpgme? (
 		app-crypt/gpgme:=
-		dev-libs/libassuan
+		dev-libs/libassuan:=
 		dev-libs/libgpg-error
 	)
 	http2? ( net-libs/nghttp2 )
diff --git a/net-misc/wget2/wget2-2.1.0.ebuild b/net-misc/wget2/wget2-2.1.0-r1.ebuild
index 745aa97146f8..adf3183d13a5 100644
--- a/net-misc/wget2/wget2-2.1.0.ebuild
+++ b/net-misc/wget2/wget2-2.1.0-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	)
 	gpgme? (
 		app-crypt/gpgme:=
-		dev-libs/libassuan
+		dev-libs/libassuan:=
 		dev-libs/libgpg-error
 	)
 	http2? ( net-libs/nghttp2 )
diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild
index 088e948a5a9b..28200b483dae 100644
--- a/net-misc/wget2/wget2-9999.ebuild
+++ b/net-misc/wget2/wget2-9999.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	)
 	gpgme? (
 		app-crypt/gpgme:=
-		dev-libs/libassuan
+		dev-libs/libassuan:=
 		dev-libs/libgpg-error
 	)
 	http2? ( net-libs/nghttp2 )