gentoo auto-resync : 06:04:2025 - 01:34:40

5 files changed, 86 insertions, 16 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index ac35a53aa8a7..be733ae5a59b 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/lyrebird/Manifest b/net-proxy/lyrebird/Manifest
index babbe1073bf2..6b0860fd63b5 100644
--- a/net-proxy/lyrebird/Manifest
+++ b/net-proxy/lyrebird/Manifest
@@ -1,7 +1,7 @@
-DIST lyrebird-0.4.0-deps.tar.xz 44450504 BLAKE2B 7d8010c4f2d911f26d37b7069908368ac56e4237c9cb25f7845b16cf881e2b25d30e135314b0f8cd60c42c7a34aedd17586689134b7357ff33e2673f9664c7c0 SHA512 8cf0b3e80a0d1bdc2af0d6900862fbc48d7fa02593d3c0a92f9d21598fd3df69aa312f55ae122837fa409b0ee83fc7373c2fd5d2a43c14f8d3e3bab77b8b77a4
-DIST lyrebird-0.4.0.tar.bz2 80497 BLAKE2B 060ceba6389f8f6a739e43162bf6b54e410c5206348f323e83130903c9dd07622393a28a0da8cf6e59376406be10d17b003e416dba3dcca8fa9ad3e41b68d4db SHA512 406d62d7da76807ad9fa1107bb9f335fc14f54dfecda26964886869e35122172d302ccc83442b355c055d506c84a212da11ea3b1f456f6fd19674a5c1bcd1773
 DIST lyrebird-0.5.0-deps.tar.xz 49717604 BLAKE2B cb490f3c5b13512f2c9238c8ea47121627d1b77c33e637096cd466d1f59fc71b6113bb10ba2ac3cee16bf9f8c8885a8f4587384bfe6f09ff8b2bbcef087e819c SHA512 33b8ab0e4850c06720430df90ca0a174925b2c03366b1dc2b71480ed3c7c8344dee4c12145654e757d9c8c2dc583a5d44b952ed021b570b86878edfa57b1cfa5
 DIST lyrebird-0.5.0.tar.bz2 111189 BLAKE2B d534074f6db7ad190b12010ddc44889c15ae2c3dc594e30dea41ae1f092ca83481ecb51611d763b63a8b3d8d97f887fdc4e216b41dab3b219d7c2df2f7b5d84f SHA512 8059583ae6ebc121cb853600d635382c9d85b6a98a71be0f7f71bfd780d4278804b89cdaa083233dcdb47ec64ebf00a32a57b84f5cd46d42c94e6a7ff74887a8
-EBUILD lyrebird-0.4.0.ebuild 1254 BLAKE2B de1748071d2856c7010c444ea0d798f6ac05a1f49ca478ce6d5b633884f199e703fe3478281805aabc5c6c35467b9c0973f0694b6cb37de8ff1950f237b523e9 SHA512 d26b1d40a2000abc603558ed7dda8f2c3c53c49f1980f1ff66412e9950cc1c202546872e51b3a89d4bbdb6530b26bc40e82d81f0b4927102e0070c07d143879f
+DIST lyrebird-0.6.0-deps.tar.xz 57712612 BLAKE2B 0fa65aff919ba783be44039652979d82c06ffb86ab14c688cbff2e30091b2e2f88c072b4d0c277777394a1cfa068a351d619dcbeac5c822b87e360a50a770519 SHA512 405a590c932af9eef73d1b7c0a72e4b81e7ef8ce9367db134d0b3c08c3dd3ec0c6c03dacabbea9f336d607b4655b9dfe3b2666cc94432c46ed4d5df0bf3217f0
+DIST lyrebird-0.6.0.tar.bz2 96527 BLAKE2B 09ef8f7acd9874e46e431030fbda4733a2400b5e437ee86e81ccc9f4e60f56ec767018f2687087a79e7e2f89d2860cdd5746d9b678e4a81f95aa174ba9716547 SHA512 e3433b9e4e4939a60e7b387ee08619e739cedb63db02c5897ad8d82e3a16646342be88ef52f184cc221cce2c26527a75a02a83b23e2e6f8ff4e19d5d6cb1a9a2
 EBUILD lyrebird-0.5.0.ebuild 1124 BLAKE2B 8fa4f06996c229103a9573681a65e3e5c5a150ea8c53d76b3b50d974ffb25af74876ea3eff1d87529a7f12164312dceedd77cd528c5136d2313e4958db01c24d SHA512 b99d1d0ba4223dec5c60925a907be15c382fdc183ac552be6b2cacab97725ef97ec77ae715f71704566e1ae433a81b737a4223c10c5703c8435353a820c80fe0
+EBUILD lyrebird-0.6.0.ebuild 1203 BLAKE2B 3d836d4d840d14860bb0eaca3d94a02e87b6922185a47becf2f2f0b441ae4427094a316ba09f9850588459d359d25fee4e0d887ffdb6ed67442f1e33bfcb4c1d SHA512 cfb5f394f5742ed8f90d033d1578183816da34b1913120de6c31e14cda2fd9f5f26486c5129e1a173cf8cb8b8c9680cdcaad3ccd1626db975c3ac756db4ae53c
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-proxy/lyrebird/lyrebird-0.4.0.ebuild b/net-proxy/lyrebird/lyrebird-0.6.0.ebuild
index ae12f6ddf3c3..b2103c68bcf4 100644
--- a/net-proxy/lyrebird/lyrebird-0.4.0.ebuild
+++ b/net-proxy/lyrebird/lyrebird-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit go-module
+inherit eapi9-ver go-module
 
 DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4"
 HOMEPAGE="https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird"
@@ -12,8 +12,10 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar
 S="${WORKDIR}"/${PN}-${P}
 
 LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
+# Dependent licenses
+LICENSE+="  0BSD Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~riscv x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-obfs4proxy )"
@@ -31,15 +33,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -z "${REPLACING_VERSIONS}" ]]; then
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 0.1.0; then
-				ewarn "Since version 0.1.0 the proxy executable is called '${PN}' rather than 'obfs4proxy'."
-				ewarn "Please update your Tor configuration accordingly."
-				ewarn
-				break
-			fi
-		done
+	if ver_replacing -lt 0.1.0; then
+		ewarn "Since version 0.1.0 the proxy executable is called '${PN}' rather than 'obfs4proxy'."
+		ewarn "Please update your Tor configuration accordingly."
+		ewarn
 	fi
 }
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index 5b39e7b2472c..0b95b4348b8f 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -2,6 +2,8 @@ DIST sshuttle-1.1.2-docs.tar.xz 8300 BLAKE2B efbffcda40422b76e18ad8e85b1ccd392a5
 DIST sshuttle-1.1.2.gh.tar.gz 111767 BLAKE2B 7f2a63df0a6e2815e8787c6e02cd81924ff3d80d4b2309d8ebb875b49db33ff5b7b8c8249760b27a942f69db049c862041433099a06f009fe3532c4cb4493bac SHA512 c24a6490c1877b9ded8f5f4f44571953c4c204c33f0238c709ca32c7a581ddc919bfc48beb4fafd3a4d346cccd9b02dc7051b6233ff989a0ad329d55c1c5ec47
 DIST sshuttle-1.3.0-docs.tar.xz 8596 BLAKE2B feef646cd450b74fd635aa942a2858dd360ee081668629b7c8a88dd3fdd9ed862bf3b37689961964d25f90ae77fb31f1ce2a53633e126f1fc7ca8adcda73f1d6 SHA512 03430d700411e3dd7d69a1bc56abf5be19cc9d128e5f7f1e07bbba992191a387b2ecfc1ec872347ad5f2b46ec09c20565f276d8fa85afd2442f195581f313562
 DIST sshuttle-1.3.0.gh.tar.gz 137742 BLAKE2B 47d548f717ff0b670a48dff675fd0898c0ac28a89afb942349a0c4eeeb3ef9d2e78a42b6b065d3a69f1a2bb05518774b2c4c21126e9a29234acc347f8ec2b751 SHA512 5a3aff534c811cc5c8e6d46fd52fd019b0e79977c357f3903cd71a3315cc6a96ca0a9128cbf74be0874c58d79d328b89db702e252ce0b24202b79782528e69ab
+DIST sshuttle-1.3.1.gh.tar.gz 168091 BLAKE2B 69abafaf556d7601776b504278bac07b6d99f4538b7179ed80f6555d2b762f057a56ec7d6f600e55f36e52e313ef22ec9618673dd80c2d501ee97f329609671a SHA512 2188fa895f56d70dc12e2cf4b44828735763b8c87544579d832af0bae880aee71466a23453a0750a684b02d9d8b4757af00434818563104285a0983a56859c99
 EBUILD sshuttle-1.1.2.ebuild 2202 BLAKE2B 262310d7f620e32f502688e05d8813800307115c26e5c1577c3361bb2462bc966c48dfb819e135491082ffc310f471e67db19e2d10540491c6858a9fa7483cc7 SHA512 87bbc5ce6d45eed71dd3e65c36bbebc5629feb111fec73ab081baf3b635a0f2593617836124ae686158fc290b695fbbdf7f8d5231e50b77f84272cee0597195c
 EBUILD sshuttle-1.3.0.ebuild 2053 BLAKE2B 6e09c239efcb3f3d90505ecad7c5fbf97e65dd531c4717e5c3fabf8aeffdb39db82ad938a9e464cc0dac88b87825b90d5255fb3e805079d91eca543af5b0b56a SHA512 8b2d6395d094973d10a9e85b413013744f5ce5d94a967c8ddd60c99f106bd8a4f3db3c8d81ec655806c0624466f659ad1bb63655b84dde908188b366223de68f
+EBUILD sshuttle-1.3.1.ebuild 2061 BLAKE2B 65d2a30580fa56347075f4a4c0156c7fe245ba87f1ad241d5950452511398bda7d58b92891a29bc3bc06d2ecf52d8e39d43e6ce90614a27346113135fa9168f1 SHA512 b1cea5e5bd70ecc9201c6407918de71a5c75c0d9f423a0ca22b439b7c1852e0171766edf29689c971a6de3678643d73207c0e9b29f74ef58aaf8da0225898b22
 MISC metadata.xml 368 BLAKE2B 8781826aa94f38296cb3c0ef628c931875cf7d8c1f3080970be16c3dd01862d067d4051f4d2c271bc63dd9260c4652ba5fd48002eb5747eab68ba9f02a6a3629 SHA512 a4609eb161d14b0b12d93406a257774465e377c432731cd6d72267baa3396545f45e5df9a16577ff143254797e872aa988213af190d47134d9f09de8d820b6d2
diff --git a/net-proxy/sshuttle/sshuttle-1.3.1.ebuild b/net-proxy/sshuttle/sshuttle-1.3.1.ebuild
new file mode 100644
index 000000000000..772f696e29a9
--- /dev/null
+++ b/net-proxy/sshuttle/sshuttle-1.3.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-sshuttle-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${SSHUTTLE_DOCS_PREBUILT:=1}
+
+SSHUTTLE_DOCS_PREBUILT_DEV=sam
+SSHUTTLE_DOCS_VERSION=${PV%.*}.0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+SSHUTTLE_DOCS_USEFLAG="+doc"
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 linux-info
+
+DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
+HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle/"
+# No tests in sdist
+SRC_URI=" https://github.com/sshuttle/sshuttle/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+if [[ ${SSHUTTLE_DOCS_PREBUILT} == 1 ]] ; then
+	SRC_URI+=" !doc? ( https://dev.gentoo.org/~${SSHUTTLE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${SSHUTTLE_DOCS_VERSION}-docs.tar.xz )"
+	SSHUTTLE_DOCS_USEFLAG="doc"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="${SSHUTTLE_DOCS_USEFLAG}"
+
+BDEPEND="
+	doc? (
+		dev-python/sphinx
+		dev-python/furo
+	)
+"
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+	|| ( net-firewall/iptables net-firewall/nftables )
+"
+
+CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Don't require pytest-cov when running tests
+	sed -i "s/^addopts =/#\0/" setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc ; then
+		emake -j1 -C docs html man
+	fi
+}
+
+python_install_all() {
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${SSHUTTLE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${SSHUTTLE_DOCS_VERSION}-docs/sshuttle.1
+	else
+		HTML_DOCS=( docs/_build/html/. )
+		doman docs/_build/man/*
+	fi
+
+	distutils-r1_python_install_all
+}