gentoo auto-resync : 26:03:2025 - 00:31:47

15 files changed, 249 insertions, 405 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index e40f8151be9b..33d423c2376a 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/derper/Manifest b/net-vpn/derper/Manifest
new file mode 100644
index 000000000000..3c51a3541e42
--- /dev/null
+++ b/net-vpn/derper/Manifest
@@ -0,0 +1,9 @@
+AUX derper-pre.sh 1269 BLAKE2B 86100763fefaf3c8f2430ba27851fd481c906f57b11e6302fc988be436cc6d672f2266bd29ccafc149360b4e8af669b086dadf8fae27f99b36044dfda4af8dac SHA512 f1f597222407eb93f5680865205985ef6b4b666ad7ce352f389446f399a41b8eb215ee56a9391262647b4118cbd378f34bdf8684560a7cb193827015aa518b9c
+AUX derper.defaults 1420 BLAKE2B 4dbfc96d2a7d510edbed97892b4549d288d85077d8e2b65d4afe79f2381d442ccb71a2b4b76904de6d98298bb4a8a8088869604968bc018579b184b1b86fb4be SHA512 bd0a868cdf48ce114175c72df1c815b0866e8155a9599ca48f33329262b579f1a9425af661db79aefcf2bfdf01971af91c8de5febd9e5b24d403b45e2d41e0c5
+AUX derper.initd 767 BLAKE2B 5bcefb21b354265a31f70f37151d1eda68c9f73aa568124a24954d55e3daff7e6c3f3b0ea2a20ded819975c9c2b223600507e751214cba9f9465d67f7ea571ca SHA512 711474f4d980f45550924b38be900945de60643f97dd247191e00ba5c47b19d816cba201b57a0b53b3f92229dde5764266b919471b0be82a14b2c6f916ae5fcb
+AUX derper.service 547 BLAKE2B ed431d7256279f2a8affc1c6faff483d93ddababd7a16233edbf475b1de0a9f56bb1c2acbd65c427bebbed9d834b2919d0c59211cd5b10a0f25d780d83d547ff SHA512 e7a7f03a4810626c4d1b03191fc03b3e1625e9896dedf3538419beb1a9b41db43973be69d197802ab83354701ab27bd450a12241fb3a88da57f6deddfb75b420
+AUX derper.service.conf 35 BLAKE2B 36f1b3354a1e7782e2ed0a79a55c26673621503cd39646a80b74c7127d3db9d2c8ce7f64e9d61ebb6dd84dbdda3683e4f6a03b74454f14865ed3395cec4c57e5 SHA512 90e0c91749d8c8f29735895cf6451a7774fbbb20c80eb346e1297a5d4bc6a9ca8093628c5b7ea5773cb01bb7d1a9012fc7081414f70f05998ec918e1905beb05
+DIST tailscale-1.80.3-deps.tar.xz 259571740 BLAKE2B 5e9c3cd9d57f416acd008a910760fcf130b32f9d81935c5c7f32822d37cd703ba07f58720bae0c67cbf85a87e93f06002edbce13efd7376eaf40bcd68fb38ba1 SHA512 f8484e9bb3329891b46282ef7e2879bf73cd3485925729ed319e76f1aca32946a56519fffaf644d504b1df4ec01ab8ee7a7a6cb30d3126b20ee5506fe65cf51a
+DIST tailscale-1.80.3.tar.gz 3528273 BLAKE2B 3f9450a24a370146dc0e32f715ffa4eba8e6a7b31c65f20b1e9b40f4bf45fb1f0f27392d2c36870fa2bf2984fb556d72347057a010f18bda2d649242d058b5b2 SHA512 2553642e9ec8adf7754cf869ec986399de22af01b66c1a4d20bff3c1305f62e175e39e70eb2a6e9723e8352421d9ad6590bbcfa42e78a4c88838bd8bb8aa6e80
+EBUILD derper-1.80.3.ebuild 1578 BLAKE2B b98307a1dca773cc44f475a37d33c1503c98d56bc3cefb1289d06244ef91f18c3c75ae0d7d33ce0c2b0356aca05b2b2bc88ab7cf62e8715cdefc315c6bf24ee5 SHA512 cbc727caf72a2a559b34a7ac600a88d6bd0a0c50bc5397386e8ad917e896ed5e33bb84ba47157ba2735c895cdebba67fe22d1b49fa7751538e31542b4e8de004
+MISC metadata.xml 325 BLAKE2B 8fc538ce81a3dcb0eed84d6b4c1706cec2bd69844a925f5ba1606518a4893a341a13d61873e5d54a348bbd4f7205363d6589fd3cabd0205bbab67777d58dacba SHA512 4e0becbc73ce5182776d3459bf9ffba3568b1f6443055731ce657d97efafa124114cf2858a9e153d121e8d067e58cca51ce0eec4624c5b27720af8769c32e2a2
diff --git a/net-vpn/derper/derper-1.80.3.ebuild b/net-vpn/derper/derper-1.80.3.ebuild
new file mode 100644
index 000000000000..7251c2aa7855
--- /dev/null
+++ b/net-vpn/derper/derper-1.80.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module linux-info systemd
+
+# share same source with net-vpn/tailscale
+VERSION_MINOR="80"
+VERSION_SHORT="1.80.3"
+VERSION_LONG="1.80.3-tbd762b827"
+VERSION_GIT_HASH="bd762b8274a957fe11c4416c6278ba0682124931"
+
+MY_P="tailscale-${PV}"
+DESCRIPTION="DERP server for tailscale network"
+HOMEPAGE="https://tailscale.com"
+SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${MY_P}-deps.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CONFIG_CHECK="~TUN"
+
+BDEPEND="
+	acct-group/derper
+	acct-user/derper
+	>=dev-lang/go-1.22
+"
+
+RESTRICT="test"
+
+# This translates the build command from upstream's build_dist.sh to an
+# ebuild equivalent.
+build_dist() {
+	ego build -tags xversion -ldflags "
+		-X tailscale.com/version.longStamp=${VERSION_LONG}
+		-X tailscale.com/version.shortStamp=${VERSION_SHORT}
+		-X tailscale.com/version.gitCommitStamp=${VERSION_GIT_HASH}" "$@"
+}
+
+src_compile() {
+	build_dist ./cmd/derper
+	build_dist ./cmd/derpprobe
+}
+
+src_install() {
+	dobin derper
+	dobin derpprobe
+
+	insinto /etc/default
+	newins "${FILESDIR}"/derper.defaults derper
+	systemd_dounit "${FILESDIR}"/derper.service
+	systemd_install_serviced "${FILESDIR}"/derper.service.conf derper
+
+	newinitd "${FILESDIR}"/derper.initd derper
+
+	keepdir /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}"/derper-pre.sh
+}
diff --git a/net-vpn/derper/files/derper-pre.sh b/net-vpn/derper/files/derper-pre.sh
new file mode 100644
index 000000000000..ba5b224109be
--- /dev/null
+++ b/net-vpn/derper/files/derper-pre.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#
+
+set -e
+
+. /etc/default/derper
+
+if [[ -z ${DERPER_USER} ]]; then
+	echo "DERPER_USER is not set via /etc/default/derper" >&2
+	exit 1
+fi
+
+if [[ -z ${CERTDIR} ]]; then
+	eval "CERTDIR=~${_user}/.cache/tailscale/derper-certs"
+	echo "CERTDIR is not set, fallback to default '${CERTDIR}' directory" >&2
+fi
+
+if [[ ! -e ${CERTDIR} ]]; then
+	mkdir -m 750 -p ${CERTDIR}
+	chown ${DERPER_USER}${DERPER_GROUP:+:}${DERPER_GROUP} ${CERTDIR}
+fi
+
+# according to: https://github.com/tailscale/tailscale/blob/651e0d8aad1e97df71ac09ee25274377995133dd/cmd/derper/cert.go#L63
+parse_hostname() {
+	local hn="${1}"
+	while [[ ${hn} =~ (.*)[^a-zA-Z0-9\.-]+(.*) ]]; do
+		hn=${BASH_REMATCH[1]}${BASH_REMATCH[2]}
+	done
+	echo -n ${hn}
+}
+
+cp_cert() {
+	local suffix=".crt" mode=640 var="CERTFILE"
+	if [[ ${FUNCNAME[1]} == cp_key ]]; then
+		suffix=".key"
+		mode=600
+		var="KEYFILE"
+	fi
+
+	if [[ -z ${HOSTNAME} ]]; then
+		echo "${var} is set while HOSTNAME is not, ignore ${var}" >&2
+	else
+		local file="${CERTDIR%/}/$(parse_hostname ${HOSTNAME})${suffix}"
+		cp -f -L ${!var} ${file}
+		chown ${DERPER_USER}${DERPER_GROUP:+:}${DERPER_GROUP} ${file}
+		chmod ${mode} ${file}
+	fi
+}
+
+cp_key() {
+	cp_cert
+}
+
+if [[ -n ${CERTFILE} ]]; then
+	cp_cert
+fi
+if [[ -n ${KEYFILE} ]]; then
+	cp_key
+fi
diff --git a/net-vpn/derper/files/derper.defaults b/net-vpn/derper/files/derper.defaults
new file mode 100644
index 000000000000..98fed53cf4a0
--- /dev/null
+++ b/net-vpn/derper/files/derper.defaults
@@ -0,0 +1,48 @@
+# executing user
+DERPER_USER=derper
+
+# executing group
+DERPER_GROUP=derper
+
+# Home dir for derper
+HOMEDIR=/var/lib/derper
+
+# server HTTPS listen address, in form ":port", "ip:port", or for IPv6 "[ip]:port".
+# If the IP is omitted, it defaults to all interfaces.
+#  If you want to listen to 443 or other well-known port
+#  you should set the executing user to the 'root'
+ADDR=":9781"
+
+# The port on which to serve HTTP.
+# -1 means disabled
+HTTP_PORT="-1"
+
+# servername for TLS cert
+HOSTNAME="derp.example.com"
+
+# mode for getting a cert.
+#  If you want to change to the 'letsencrypt' mode,
+#  the DERP server should be listened on 443 port, and
+#  the http port 80 should be listened also at the first time
+CERTMODE="manual"
+# cert dir
+#   when in the 'manual' mode, the default cert file and private key
+#   will be read via path:
+#     CERTDIR/HOSTNAME.crt
+#     CERTDIR/HOSTNAME.key
+#   and all non [a-zA-Z0-9\.-] characters will be removed
+#   from the HOSTNAME
+CERTDIR="/var/lib/derper/certs"
+# The custom cert and key file path,
+# simplify the certificate deployment process in manual mode,
+# the two files will overwrite the default cert and key files
+# everytime when derper service starts.
+#CERTFILE=
+#KEYFILE=
+
+# extra arguments passed to the derper
+# run derper --help to get help
+#   -verify-clients
+#           verify clients to this DERP server through a local tailscaled instance.
+FLAGS="-verify-clients"
+
diff --git a/net-vpn/derper/files/derper.initd b/net-vpn/derper/files/derper.initd
new file mode 100644
index 000000000000..ef76ad085ed0
--- /dev/null
+++ b/net-vpn/derper/files/derper.initd
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+. /etc/default/derper
+
+name="derper"
+description="Tailscale DERP server"
+command="/usr/bin/derper"
+command_args=" \
+	-certdir ${CERTDIR} \
+	-certmode ${CERTMODE} \
+	-hostname ${HOSTNAME} \
+	-a ${ADDR} \
+	-http-port ${HTTP_PORT} \
+	-c '${HOMEDIR}'/derper.key \
+	${FLAGS}
+"
+command_user="${DERPER_USER}:${DERPER_GROUP}"
+command_background=true
+pidfile="/run/derper.pid"
+directory="${HOMEDIR}"
+output_log="/var/log/derper/derper.log"
+error_log="/var/log/derper/derper.error"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath -d -m 700 -o ${command_user} /var/log/derper
+	checkpath -d -m 750 -o ${command_user} ${HOMEDIR}
+	/usr/libexec/derper-pre.sh
+}
diff --git a/net-vpn/derper/files/derper.service b/net-vpn/derper/files/derper.service
new file mode 100644
index 000000000000..44c093af85a5
--- /dev/null
+++ b/net-vpn/derper/files/derper.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Tailscale DERP server
+Documentation=https://tailscale.com/kb/1118/custom-derp-servers
+Wants=network-pre.target
+After=network-pre.target NetworkManager.service systemd-resolved.service
+
+[Service]
+EnvironmentFile=/etc/default/derper
+ExecStartPre=+/usr/libexec/derper-pre.sh
+ExecStart=/usr/sbin/derper -certdir ${CERTDIR} -certmode ${CERTMODE} -hostname ${HOSTNAME} -a ${ADDR} -http-port ${HTTP_PORT} -c "${HOMEDIR}"/derper.key ${FLAGS}
+ReadWritePaths=${HOMEDIR} ${CERTDIR}
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-vpn/derper/files/derper.service.conf b/net-vpn/derper/files/derper.service.conf
new file mode 100644
index 000000000000..0640c936cca6
--- /dev/null
+++ b/net-vpn/derper/files/derper.service.conf
@@ -0,0 +1,3 @@
+[Service]
+User=derper
+Group=derper
diff --git a/net-vpn/derper/metadata.xml b/net-vpn/derper/metadata.xml
new file mode 100644
index 000000000000..8799a931f9d4
--- /dev/null
+++ b/net-vpn/derper/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tailscale/tailscale</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index fe232eee5ed2..6728b7918126 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -2,7 +2,7 @@ AUX 2.7.0-force-gentoo-classpath.patch 14038 BLAKE2B 0ff68b25587b1a63db922e84782
 AUX i2p.init 278 BLAKE2B 2e26e9d25e21494d2f6a221a3c332f1afe475513096eb7c51a0fbc4cacc8e9bd418f98d622cb054f55d7b7c4941054be8b6314f9b19c249e9ad0e77893980ca6 SHA512 1edb33cd0df28de95e02b1015e86cbc44c867a8df1260abb0565bc232c2cccc2625d36fdefa4a050ea3215d938c1ff0521a591a0bc2b27d57ca6be621795cd52
 AUX i2p.service 172 BLAKE2B 8523af82e33d7a8f5b37138f8d28c7adb4c08607b84813f35b42f11064c0ec2768bf443eca32bd7b281ed084d6b820b23977c55a1cd5b8ad058ab18117b83f90 SHA512 c87574c968f4142b3dbe556dab86438765dc8b9b23475dca8c7e268d2963e5dffcd9175bb749b2d42c3fc7fe75d9175158f56cb78f0fa4faa7d6029fdf4b8e6c
 DIST i2psource_2.7.0.tar.bz2 33683394 BLAKE2B aa3505b2bcd402e8d2d8bae4955e1cbd52939e5a3bb567ef4e918f895021489fd7dc0663f86f1cf6a998105cc3e0296971bac22ec04348fa4aa392f23dd28560 SHA512 a216ca91351bbdef7844376f8d77686a48f3b0ab72a3b446866f788035f652badb19e7e123586f47adf5befc4cc295b4395def94971065068c7f487ed1111643
-DIST i2psource_2.8.0.tar.bz2 33785482 BLAKE2B af9fac097cce79b1700adc374cc0d53c0732257d2f48f717962a93c852ab718d137c36d7bdf40504d25bcea2336d4b1605c5f87feada5c2dedb9b99426377ae7 SHA512 af08ec4b5962e22e41e4e6d43cde28921161469da772bb92c23a603c49372211374e3183c2537d7c4557b793ac062866adfc3b5500e46663ce6dc6842e847a7b
+DIST i2psource_2.8.1.tar.bz2 33757602 BLAKE2B a94fedc17c10d081cd74bf7ac3f48033eeb4b431b863036deb9543286d94d744ae33dc64fef7fe84aac0a9b422aad1c1c8a93936a888391f90f1c35d4a756e77 SHA512 27b02ae3dd43cbde1576b25967d124b32268bcff3ee27181cf5477e5a6b5606213ab261d8f35276b3a06b25ac43a719d029578d35fbfadf352031d0d776e758e
 EBUILD i2p-2.7.0.ebuild 8121 BLAKE2B 5d453b81ee2c1d16f1b09fc9a3706a84f79f6c5ffeab8245678c525b5f0d0e0a13463d246f29c4ec8f117f38f24c23563a024c5768e4ceaa7f944277a3e32ae1 SHA512 da2a327c2326e5a79144b7d7cb0b97d498dc029c0cde36cfce6f76bd3a952887b319715f990cca941cee535ce24bc24508eb66c0c198a2761c040729710dd22c
-EBUILD i2p-2.8.0.ebuild 8122 BLAKE2B c0d95a91cfd7637aff16c964ddc3a8e8b1f22c6b3f96901e6b993a73b7e489028f456c24f592307a56b97a80e09a7ca7090540f020b5ccee689521978ecd6488 SHA512 e509541de1c7346587e83cf96f3c3a5b4b1cdefdd1d988213b52d01b353b20875bcc1bf8f1c84ce06646d72de5a2696f705e495ba50d44be9c90da3408b74d8c
+EBUILD i2p-2.8.1.ebuild 8122 BLAKE2B c0d95a91cfd7637aff16c964ddc3a8e8b1f22c6b3f96901e6b993a73b7e489028f456c24f592307a56b97a80e09a7ca7090540f020b5ccee689521978ecd6488 SHA512 e509541de1c7346587e83cf96f3c3a5b4b1cdefdd1d988213b52d01b353b20875bcc1bf8f1c84ce06646d72de5a2696f705e495ba50d44be9c90da3408b74d8c
 MISC metadata.xml 743 BLAKE2B 020f7bd72231ce0cb37929330c1f73be6cd91e5d13f86202c6d5da5b2ced53e2b3df172dcf63fb37ae2028019376422ffa7fc8ad94f206f0996984294f353503 SHA512 c1cd68d0fe33ca5b738973fedf764141d490430afa968b325b4a2bc853e6206c0c1683724ff5e4829ac97482b40490cfb3b14b03711149a84baa1e6ecc27dbee
diff --git a/net-vpn/i2p/i2p-2.8.0.ebuild b/net-vpn/i2p/i2p-2.8.1.ebuild
index 442a6d309a7b..442a6d309a7b 100644
--- a/net-vpn/i2p/i2p-2.8.0.ebuild
+++ b/net-vpn/i2p/i2p-2.8.1.ebuild
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index efafdc09b573..e87ed5221531 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -4,18 +4,13 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a7d8e40ff30290bf836907b561586d0f429b7ddf05286ab51974d207906a0fe52cb2fbcc8e160f SHA512 786481b20d7cab9696656c5136ff74c9c2aaa73ca3d63b163a294b9b3c4b628da387cb5ec3ada81277ca81cff16ead5162f3b4d64cb0d773c22f2e4607c3194b
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
-DIST tor-0.4.8.13.tar.gz 9912610 BLAKE2B b55b29b5b2d4aa391f8d9d22657833647064af354ac8b6751ddc096fa30d0b43399851d11b0e8a41c7537aa134b61aa65c9b94f2a1854eea7c01a2bfa63f1110 SHA512 7a095931ed709333a512535212048360d9d90907c3c71a8c6dc55fd52ccf515aa42c7ec6e18c7fb5fde7f5e1b1da1753f1380a274743b6420ac49ed1a3bb1a0c
-DIST tor-0.4.8.13.tar.gz.sha256sum 86 BLAKE2B 8e2fce0973e9798c3396fc4c070afe5d4ecf42368aa35e7ee13737c7a0b1c6a45c628605ec1879c9c923380bfb1b9d401b2527cf5bb3768630ac526b22d0be18 SHA512 b059030226b70224c10dabb3517c1d33419d138505b2f339f3a921844e921bed0056a4836559789d74b10fe552897c12716d956dae46474634bb814ab19211f0
-DIST tor-0.4.8.13.tar.gz.sha256sum.asc 716 BLAKE2B 8f708838cc4b642168b689e9ce9bd8daca513db308d86a4d0193edaee8ad47cb52bb0b5af9236da302b9cce542f2dd52a5c86130cd30b5320560e58b7f71fb9c SHA512 879ee66396cd1a751980686c79b03cf85ae19828255b0e0058540d72d0d365aa82778f009824cab310403bda98c968fac956905a9cb8f6877b960897e0476dd0
 DIST tor-0.4.8.14.tar.gz 9965322 BLAKE2B 335b76dec29139199ebfbc5f598b66f31bcc1d34c06bc51a4bcc64831a6cfb639fbe1fc91b1686720a4024a10c9b203d7813c734e9db47e087628e85b557fe65 SHA512 96f6c8ce00542e97d75516fcf10cf5649243f695b7c7dd3e52bdda095ea9019743648335a2689fa2e23c046e64728fecdd72b48f2ec2db30fb4216393db7f641
 DIST tor-0.4.8.14.tar.gz.sha256sum 86 BLAKE2B 340def77987ebde18f94339f46e566d11dc76b0ac87f995716aafe00de5727c3274e2065ad1832695b986245e95457773b4fb9c8a8cb3817c417b9ffe8ec5bee SHA512 e2e5d952342b22a78fcb4b92518146ca8e0214af85c7b03b6bf67c38f18c85792423dc64c215db922acc6b4422ed4aa10d05da1f3fa6e2a410684b78e67e6349
 DIST tor-0.4.8.14.tar.gz.sha256sum.asc 716 BLAKE2B 98d5bfb4e8db7e16ed643b5cb819fe91d09f8c981e8023278a9082936eeeee6afc712de958375ed522d10a2f8e4ac5a896b843965bf59e3edcc57985dcf4e844 SHA512 5c75db16edde17a007bc92f103559a49e2731fa4182f06d120a0f8735bada0094c878aed0d062b8e089cd9e8c6c64d2ffb17da274b014fcfdff8f949edcea59b
-DIST tor-0.4.8.15.tar.gz 9927684 BLAKE2B 1e72d53c5a1db9808e025301d5e2f9f6f9b46c0ea8d322871dec9be44c8512e1429ca7ede41e8aae0aa36a0c137d8660241b5f52b1ac1b8a48938ee02b4ad455 SHA512 60fbaccee0355f6cbdaa447066ca0ccc75917ec63a78ea67698471b3da4a0f08d12a6b28f63224fca582fdae27238fff9b062a120b47a3d7ff29e172ca769085
-DIST tor-0.4.8.15.tar.gz.sha256sum 86 BLAKE2B b618fcc3c0f0e79d631de30f558e2e009683ff8d46d0564c7fe2cb777ce150a799a6b80f498852fa96acf8c8745692646f7f333627496eb42e538412da232796 SHA512 70cce3c5f51a2b45fc0e681bb55bfb86208d62a12af7a0cd2dd1eb089a6e24f125bf6ed59f6a241fc8400608c90e13973db6376c8adaff8cbbe2ea870a43e13f
-DIST tor-0.4.8.15.tar.gz.sha256sum.asc 716 BLAKE2B 838a69447d49c10e8c37ed64d0c1c999d9127287d8a8293d0d9e295e4f646dc053b5bef32d58a2c7e623384d37456bcd017eec2a372018797557762b33ba6fb7 SHA512 87929ca1a80a81df858f48ecec8d3e4719d277fdc257dddb76100a271826d4c9292f10526c3567d24fdfb7cf92e3520728e3776dec994de40a5e97c0674e050d
-EBUILD tor-0.4.8.13-r1.ebuild 4759 BLAKE2B 0bb00c92c6a754370219b8cf7a7786b2ce50246f1377b332d080f026f2869256d18dcacbe08ef7651765dcc7fccf7895efc61f7b31cf9698fd66dfb45d1c838c SHA512 47006df79528d38977a45d4b025d83bbb3669815d42f640bcccf634f4c8fe9ca1c805755fd1e29efc8540c89852d564141db912e16d4043a3ff373e98b015e40
-EBUILD tor-0.4.8.13.ebuild 4713 BLAKE2B 1320cc00cab15b86d63645ca2ef80d224346e02eae654cc84a1ab3d939f06ea4a603a06a8f9f1217be81908cc52d3951c8378f7b724ae1535aff3a2fbdf369ec SHA512 96ca832249cadf1af659237b73cc714c989189fe337189632e970f57fbe0cb520a163881cd74eba17bd3a07e138dea94fe8cea70ae4c181cce4f26a883f1e028
+DIST tor-0.4.8.16.tar.gz 9930424 BLAKE2B fdaf3d124d3e1b11589a5219033c8d37d3e6c8986ff60e930d2bf80532dd6be4c7ee1634bd0806bd283a9954e4478f3be7b9b61abd13e3274fef3b8373df1b00 SHA512 4815fe3da63f582e8347ab5c4fcec75816c06e79a3b420ba15a03d6d7f4a12654b771555a9271ea66fb8f4f007e4772224e565ee02b920fed90b3e530a588d94
+DIST tor-0.4.8.16.tar.gz.sha256sum 86 BLAKE2B fed27331bd5119d9913acfdbb290d454ceee9d4c3f633e50e9e590c31a2753a206874e35447e4e54ec1fad323e38e6be8594aa991cb5b4ddf543740a22930c48 SHA512 9f7af97a64948551dffb6e565b8ead1cc7020ca7823bce27da8540eb0b3b4fd27c66709495c3f6e4ef0aa0bdb7854c1b1ed167de3ee8506081ba9ed92a0ea115
+DIST tor-0.4.8.16.tar.gz.sha256sum.asc 716 BLAKE2B 65c903ecb214d1f799cfef780612650a6d70e542007cee26aede1d55bd8bc3b77cc64d805b45824f97b92fef58f628c5d3c0c2a7c2fca82a5f488556763e2527 SHA512 234de1b626a2e9cb7ecc5ea82b609b8962a6b736169180a1412c8232f4eedf6296e637aea6dcdbe69c7f6ef1f63e541686560aad288f74b5e0c5ff32b5d9dbf7
 EBUILD tor-0.4.8.14.ebuild 4759 BLAKE2B 0bb00c92c6a754370219b8cf7a7786b2ce50246f1377b332d080f026f2869256d18dcacbe08ef7651765dcc7fccf7895efc61f7b31cf9698fd66dfb45d1c838c SHA512 47006df79528d38977a45d4b025d83bbb3669815d42f640bcccf634f4c8fe9ca1c805755fd1e29efc8540c89852d564141db912e16d4043a3ff373e98b015e40
-EBUILD tor-0.4.8.15.ebuild 4765 BLAKE2B c6ef4b7ee07e3d40855c31159fc66951400a5213b113f21c57ffd22ff7b556ace6716ff94abecd3f3d5c0a825e7295db4c53a6bbf1c3571ca68cf79c95a6efee SHA512 1b24f9b3128da232c4ed1861d8686b25d57eedeb893f4083888227db098a8978bb5d836f99a4b89a8e38c3fdd4a94439140dfcb072578b1932237e874b65620a
+EBUILD tor-0.4.8.16.ebuild 4765 BLAKE2B c6ef4b7ee07e3d40855c31159fc66951400a5213b113f21c57ffd22ff7b556ace6716ff94abecd3f3d5c0a825e7295db4c53a6bbf1c3571ca68cf79c95a6efee SHA512 1b24f9b3128da232c4ed1861d8686b25d57eedeb893f4083888227db098a8978bb5d836f99a4b89a8e38c3fdd4a94439140dfcb072578b1932237e874b65620a
 EBUILD tor-9999.ebuild 4765 BLAKE2B c6ef4b7ee07e3d40855c31159fc66951400a5213b113f21c57ffd22ff7b556ace6716ff94abecd3f3d5c0a825e7295db4c53a6bbf1c3571ca68cf79c95a6efee SHA512 1b24f9b3128da232c4ed1861d8686b25d57eedeb893f4083888227db098a8978bb5d836f99a4b89a8e38c3fdd4a94439140dfcb072578b1932237e874b65620a
 MISC metadata.xml 645 BLAKE2B a7f450c6cfb9a605f7021cbe533ec64ff0926c9877bef7aace8ce1770a8ec552255b5c54ac80035646c3515d7d0b778100573897068d0905a56f7b860c8de21b SHA512 e5724033912b73ab8abe1b47e74578c8fe4bf6e341b8e7d7434d69071508cd1f35d97f4c7ade9787ae0ded6660cf0a5477d3c7462ed13832693bfd6205f0f0f1
diff --git a/net-vpn/tor/tor-0.4.8.13-r1.ebuild b/net-vpn/tor/tor-0.4.8.13-r1.ebuild
deleted file mode 100644
index 252fac071348..000000000000
--- a/net-vpn/tor/tor-0.4.8.13-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/torproject.org.asc
-inherit edo python-any-r1 readme.gentoo-r1 systemd verify-sig
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="https://www.torproject.org/ https://gitlab.torproject.org/tpo/core/tor/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.torproject.org/tpo/core/tor"
-	inherit autotools git-r3
-else
-	SRC_URI="
-		https://www.torproject.org/dist/${MY_PF}.tar.gz
-		https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
-		verify-sig? (
-			https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum
-			https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
-		)
-	"
-
-	S="${WORKDIR}/${MY_PF}"
-
-	if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-		KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
-	fi
-
-	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20230727 )"
-fi
-
-# BSD in general, but for PoW, needs --enable-gpl (GPL-3 per --version)
-# We also already had GPL-2 listed here for the init script, but obviously
-# that's different from the actual binary.
-LICENSE="BSD GPL-2 GPL-3"
-SLOT="0"
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libevent-2.1.12-r1:=[ssl]
-	dev-libs/openssl:=[-bindist(-)]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	man? ( app-text/asciidoc )
-	lzma? ( app-arch/xz-utils )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		${DEPEND}
-		${PYTHON_DEPS}
-	)
-"
-RDEPEND+="
-	acct-user/tor
-	acct-group/tor
-	selinux? ( sec-policy/selinux-tor )
-"
-BDEPEND+="
-	acct-user/tor
-	acct-group/tor
-"
-
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# test correctly fails because -lnacl fails if not available
-	# https://bugs.gentoo.org/900092
-	crypto_scalarmult_curve25519
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		if use verify-sig; then
-			cd "${DISTDIR}" || die
-			verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
-			verify-sig_verify_unsigned_checksums \
-				${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
-			cd "${WORKDIR}" || die
-		fi
-
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Running shellcheck automagically isn't useful for ebuild testing.
-	echo "exit 0" > scripts/maint/checkShellScripts.sh || die
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
-
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	export tor_cv_PYTHON="${EPYTHON}"
-
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/var"
-		--disable-all-bugs-are-fatal
-		--enable-system-torrc
-		--disable-android
-		--disable-coverage
-		--disable-html-manual
-		--disable-libfuzzer
-		--enable-missing-doc-warnings
-		--disable-module-dirauth
-		--enable-pic
-		--disable-restart-debugging
-
-		# Unless someone asks & has a compelling reason, just always
-		# build in GPL mode for pow, given we don't want yet another USE
-		# flag combination to have to test just for the sake of it.
-		# (PoW requires GPL.)
-		--enable-gpl
-		--enable-module-pow
-
-		$(use_enable man asciidoc)
-		$(use_enable man manpage)
-		$(use_enable lzma)
-		$(use_enable scrypt libscrypt)
-		$(use_enable seccomp)
-		$(use_enable server module-relay)
-		$(use_enable systemd)
-		$(use_enable tor-hardening gcc-hardening)
-		$(use_enable tor-hardening linker-hardening)
-		$(use_enable test unittests)
-		$(use_enable zstd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local skip_tests=(
-		# Fails in sandbox
-		:sandbox/open_filename
-		:sandbox/openat_filename
-	)
-
-	if use arm ; then
-		skip_tests+=(
-			# bug #920905
-			# https://gitlab.torproject.org/tpo/core/tor/-/issues/40912
-			:sandbox/opendir_dirname
-			:sandbox/openat_filename
-			:sandbox/chmod_filename
-			:sandbox/chown_filename
-			:sandbox/rename_filename
-		)
-	fi
-
-	# The makefile runs these by parallel by chunking them with a script
-	# but that means we lose verbosity and can't skip individual tests easily
-	# either.
-	edo ./src/test/test --verbose "${skip_tests[@]}"
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit "${FILESDIR}"/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-vpn/tor/tor-0.4.8.13.ebuild b/net-vpn/tor/tor-0.4.8.13.ebuild
deleted file mode 100644
index 2cc565cd9bfa..000000000000
--- a/net-vpn/tor/tor-0.4.8.13.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/torproject.org.asc
-inherit edo python-any-r1 readme.gentoo-r1 systemd verify-sig
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="https://www.torproject.org/ https://gitlab.torproject.org/tpo/core/tor/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.torproject.org/tpo/core/tor"
-	inherit autotools git-r3
-else
-	SRC_URI="
-		https://www.torproject.org/dist/${MY_PF}.tar.gz
-		https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
-		verify-sig? (
-			https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum
-			https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
-		)
-	"
-
-	S="${WORKDIR}/${MY_PF}"
-
-	if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-		KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
-	fi
-
-	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20230727 )"
-fi
-
-# BSD in general, but for PoW, needs --enable-gpl (GPL-3 per --version)
-# We also already had GPL-2 listed here for the init script, but obviously
-# that's different from the actual binary.
-LICENSE="BSD GPL-2 GPL-3"
-SLOT="0"
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/tor
-	acct-group/tor
-	>=dev-libs/libevent-2.1.12-r1:=[ssl]
-	dev-libs/openssl:=[-bindist(-)]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	man? ( app-text/asciidoc )
-	lzma? ( app-arch/xz-utils )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
-	systemd? ( sys-apps/systemd:= )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-tor )
-"
-DEPEND+="
-	test? (
-		${DEPEND}
-		${PYTHON_DEPS}
-	)
-"
-
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# test correctly fails because -lnacl fails if not available
-	# https://bugs.gentoo.org/900092
-	crypto_scalarmult_curve25519
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		if use verify-sig; then
-			cd "${DISTDIR}" || die
-			verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
-			verify-sig_verify_unsigned_checksums \
-				${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
-			cd "${WORKDIR}" || die
-		fi
-
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Running shellcheck automagically isn't useful for ebuild testing.
-	echo "exit 0" > scripts/maint/checkShellScripts.sh || die
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
-
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	export tor_cv_PYTHON="${EPYTHON}"
-
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/var"
-		--disable-all-bugs-are-fatal
-		--enable-system-torrc
-		--disable-android
-		--disable-coverage
-		--disable-html-manual
-		--disable-libfuzzer
-		--enable-missing-doc-warnings
-		--disable-module-dirauth
-		--enable-pic
-		--disable-restart-debugging
-
-		# Unless someone asks & has a compelling reason, just always
-		# build in GPL mode for pow, given we don't want yet another USE
-		# flag combination to have to test just for the sake of it.
-		# (PoW requires GPL.)
-		--enable-gpl
-		--enable-module-pow
-
-		$(use_enable man asciidoc)
-		$(use_enable man manpage)
-		$(use_enable lzma)
-		$(use_enable scrypt libscrypt)
-		$(use_enable seccomp)
-		$(use_enable server module-relay)
-		$(use_enable systemd)
-		$(use_enable tor-hardening gcc-hardening)
-		$(use_enable tor-hardening linker-hardening)
-		$(use_enable test unittests)
-		$(use_enable zstd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local skip_tests=(
-		# Fails in sandbox
-		:sandbox/open_filename
-		:sandbox/openat_filename
-	)
-
-	if use arm ; then
-		skip_tests+=(
-			# bug #920905
-			# https://gitlab.torproject.org/tpo/core/tor/-/issues/40912
-			:sandbox/opendir_dirname
-			:sandbox/openat_filename
-			:sandbox/chmod_filename
-			:sandbox/chown_filename
-			:sandbox/rename_filename
-		)
-	fi
-
-	# The makefile runs these by parallel by chunking them with a script
-	# but that means we lose verbosity and can't skip individual tests easily
-	# either.
-	edo ./src/test/test --verbose "${skip_tests[@]}"
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r9 tor
-	systemd_dounit "${FILESDIR}"/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r2 torrc
-}
diff --git a/net-vpn/tor/tor-0.4.8.15.ebuild b/net-vpn/tor/tor-0.4.8.16.ebuild
index cd30d48f8f7e..cd30d48f8f7e 100644
--- a/net-vpn/tor/tor-0.4.8.15.ebuild
+++ b/net-vpn/tor/tor-0.4.8.16.ebuild