gentoo auto-resync : 17:07:2024 - 12:28:31

4 files changed, 2 insertions, 79 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index f4ac8a4f462c..49f32686dc65 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index 667f749a870c..967a4ee597ba 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,7 +1,4 @@
-DIST sshuttle-1.1.1-docs.tar.xz 8048 BLAKE2B f6318110f67a4882a733d9b389c52eefd2e769b70f3282e7699425b6e6d3a9c5a60219978e248aaf1e7f184491db9aea4aab2efad09eb0af3ee095e0cf527d54 SHA512 c2ef822f872f6afd1d9c64e7a412ad65cca0486115dcfa0673a7a1b0554bfd1413f673248e30fa01759daaf1a1a0061f48a42170d7b234448093d3562f757cd9
-DIST sshuttle-1.1.1.tar.gz 93639 BLAKE2B 63725146dd5fcd07f4b291f981ca947a514735014f4f8173023d3982796ce4ef96b9defb39beef026d32b2162d11951742c57dee1f04cd453cf85ca08c8d2468 SHA512 07a3371c4998f37410692f9c5eaa456ff28b2dbffff731a0be3877d96c820b42c83cb386ec3ab54b524d4b333edd1a2289cd949c7d59b98a11b1ee2d6867da4f
 DIST sshuttle-1.1.2-docs.tar.xz 8300 BLAKE2B efbffcda40422b76e18ad8e85b1ccd392a5ca342897d3a179b31b5f000954b2021c877680eda6a0aae70c8594704afb8a81599f2c79dd1c954665c437ad789f2 SHA512 b48896b48da2540e561fec10ae20a8b53ffc8df59c7917e7166f138b6c2ad2d3555949d9f10934886e3c6d5a062e20460e985c064b1502a3951149265c332956
 DIST sshuttle-1.1.2.gh.tar.gz 111767 BLAKE2B 7f2a63df0a6e2815e8787c6e02cd81924ff3d80d4b2309d8ebb875b49db33ff5b7b8c8249760b27a942f69db049c862041433099a06f009fe3532c4cb4493bac SHA512 c24a6490c1877b9ded8f5f4f44571953c4c204c33f0238c709ca32c7a581ddc919bfc48beb4fafd3a4d346cccd9b02dc7051b6233ff989a0ad329d55c1c5ec47
-EBUILD sshuttle-1.1.1.ebuild 2072 BLAKE2B 492868bc3fee22a3a1dfde28a41042bbb7723f6f34c311c2305850809738010852eb5b298630ca3ec457a67183cd84b38d790e628ae5bf60458dbb63df35fa02 SHA512 ffb90f6f59c6c79582893e3fb52fd4ba0410e331618e244edc7f16693a8d3b8f8f70a7aeb587586c6078bb70de3a76693a3eeb2bab06ad4df074aec8cb533e43
-EBUILD sshuttle-1.1.2.ebuild 2202 BLAKE2B a06ef6457069e926537f8ac77e435b551d30100175720100b7f61dd57df825f876faa865a6a5c9d24926c91c02382632e41a9ba7b097a70a4409894d4348fe72 SHA512 5ab4f0e4685da38071a304248de80a6f7912ac66a87b595ca4585b29a5b525363ea287a0f0a3d6dd2aa09af30ae3597e5a78553d482b0300e40de8ba1903b89b
+EBUILD sshuttle-1.1.2.ebuild 2202 BLAKE2B 262310d7f620e32f502688e05d8813800307115c26e5c1577c3361bb2462bc966c48dfb819e135491082ffc310f471e67db19e2d10540491c6858a9fa7483cc7 SHA512 87bbc5ce6d45eed71dd3e65c36bbebc5629feb111fec73ab081baf3b635a0f2593617836124ae686158fc290b695fbbdf7f8d5231e50b77f84272cee0597195c
 MISC metadata.xml 368 BLAKE2B 8781826aa94f38296cb3c0ef628c931875cf7d8c1f3080970be16c3dd01862d067d4051f4d2c271bc63dd9260c4652ba5fd48002eb5747eab68ba9f02a6a3629 SHA512 a4609eb161d14b0b12d93406a257774465e377c432731cd6d72267baa3396545f45e5df9a16577ff143254797e872aa988213af190d47134d9f09de8d820b6d2
diff --git a/net-proxy/sshuttle/sshuttle-1.1.1.ebuild b/net-proxy/sshuttle/sshuttle-1.1.1.ebuild
deleted file mode 100644
index f2826293e380..000000000000
--- a/net-proxy/sshuttle/sshuttle-1.1.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 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}
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-SSHUTTLE_DOCS_USEFLAG="+doc"
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1 linux-info pypi
-
-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/"
-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 )
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-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 run tests via setup.py pytest
-	sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die
-
-	# 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
-}
diff --git a/net-proxy/sshuttle/sshuttle-1.1.2.ebuild b/net-proxy/sshuttle/sshuttle-1.1.2.ebuild
index 0c3c7b286c31..6580b9328e37 100644
--- a/net-proxy/sshuttle/sshuttle-1.1.2.ebuild
+++ b/net-proxy/sshuttle/sshuttle-1.1.2.ebuild
@@ -14,7 +14,7 @@ SSHUTTLE_DOCS_VERSION=${PV}
 SSHUTTLE_DOCS_USEFLAG="+doc"
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit distutils-r1 linux-info
 
 DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"