gentoo resync : 16.04.2022

6 files changed, 2 insertions, 270 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 92abe83d3f41..314953c7c261 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 7ad5654b7b59..99a9ae8ba162 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,7 +9,6 @@ DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 3462f0a67070bd61266cc67d7d419dfb9e209
 DIST haproxy-2.2.22.tar.gz 2949092 BLAKE2B 3dc7183f31cd0a95be516fbedab1eacae00761f8f2bee8478cd0c446f80c4f40c7012b64485bc598d124e3430611f6b9a748c68e1b6b379519af5308e3ed4c20 SHA512 4a99d196257fb3c99a1d76d6f9a714c673226821439b67f646fa04033f31af9ac8f783f5a984c143372d79d728476aa8b2b35d8a2f31b7fc86c09b8f9ad65615
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799 SHA512 a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
 DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899 SHA512 da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71
-DIST haproxy-2.4.4.tar.gz 3587306 BLAKE2B 983f5919b738419d616b35c1cad6aa2400b0b857160ecfac3bcdfcc14c15280283ae3f33036652a3a9b5bfff0fbb6a54912807ea7c83c828d2b5ba72274fe1a8 SHA512 a8987e8342fdbec7e48de09a4391a67e77e05493260e0e561e8c185b6457b8e1086cc45ce04ebf3365699c008dff81667490e2fe99c33c0ac3c7513df8ae025c
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50 SHA512 95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.5.tar.gz 3821477 BLAKE2B 0680925026edf56f4369c71092c39f4ff3956a8cf04320326623b3031f719d62077acdca457a6cfd82f6bcbf510920113a0328a2d8cd4a208c3d9e49e1d431b5 SHA512 f68af2be330b0fa817f7611ff46e0d3e0cc52d024b20394a5f1eedf33e6774115ee6f35ecd82d33b9ecedea2fe5afcfa32270cee33a1f6ce1726d96cc8c0d821
 EBUILD haproxy-2.0.25.ebuild 5356 BLAKE2B 3e66fd23b24ac10f251ca4c0b20b9fc7f51c55a7235ea362b22f71f9e581c36c93dcb4046cc14dcf687669eb64a71e221f7affd9e811cf94361e4e86754fb3bd SHA512 316ba774a164527afb0c56da9fe3433cc3c96becef081388b5756d819e0962d15a61d67388e9776ee194582a1e7dd97105ee58e194c94689047aad38b20509c1
@@ -22,7 +21,6 @@ EBUILD haproxy-2.2.22-r1.ebuild 5360 BLAKE2B d24fc1ded9025265f690e012f0faed1a820
 EBUILD haproxy-2.2.9999.ebuild 5360 BLAKE2B d24fc1ded9025265f690e012f0faed1a820cd7b08b43b85617d6ccc2d6b57c05e9d14557327a6ce0fb524268d0a8784b62ac8dc582e0939225b4a7282aaf1526 SHA512 c845dd7919e180ec5fc36b90bb3c29d251cf5e679c93b926819eccac00377b676249db99288b8efa5277a6d021629208b30cad5ffc107f18651932681db21bef
 EBUILD haproxy-2.4.14.ebuild 5595 BLAKE2B 2c7a17200dd15b6ef8bc59f42914e1dfe4ffd74ab8aec5c2d3d3ecd889bf253581df48455a0620e33cc0874913dc3ad77e93aef62a4472b98de927054091e286 SHA512 b69000bb71d34920f46d981750e840af9c2cb89dc42cec9c3201cfdf1e8f2bd7358fd78810d7fc6a5e1c0fc6c91688f1d427485d86a388e1d9aae36cbb0f6c7b
 EBUILD haproxy-2.4.15-r1.ebuild 5597 BLAKE2B 4279dcf4971efc73c4e5b636e2d15fd4dfe754a62d1f197ce9f38e1626513df92f662e78c648a6c21c15ae623cf95b2b310b7ee61a70bee84b6822162ac60b19 SHA512 447c3ec8b502d8dbc0aa5b8134f7b0a7910b34815f2c819b1d6c1e2f480bcc2f5daf6a2f80398ddb0633f6bed34861557b4e9452cf928fa7d19a89c7691976ae
-EBUILD haproxy-2.4.4.ebuild 5593 BLAKE2B 002077766f498b95a45ebb5dca32e451635890bd2cb1ff531afa08df83e584448635070c1244ef718aa17965753ef7a11008b25a1bbd34ac36357507d57906ff SHA512 2ec3341505114a1be11c30b11d6a2c7658131393849f19e257e8cbb024a278bd656098b12b9c45a3c4c4e4aafe9edac18d39d67e288650a8b46261e039d5439f
 EBUILD haproxy-2.4.9999.ebuild 5597 BLAKE2B 4279dcf4971efc73c4e5b636e2d15fd4dfe754a62d1f197ce9f38e1626513df92f662e78c648a6c21c15ae623cf95b2b310b7ee61a70bee84b6822162ac60b19 SHA512 447c3ec8b502d8dbc0aa5b8134f7b0a7910b34815f2c819b1d6c1e2f480bcc2f5daf6a2f80398ddb0633f6bed34861557b4e9452cf928fa7d19a89c7691976ae
 EBUILD haproxy-2.5.4.ebuild 5595 BLAKE2B 2c7a17200dd15b6ef8bc59f42914e1dfe4ffd74ab8aec5c2d3d3ecd889bf253581df48455a0620e33cc0874913dc3ad77e93aef62a4472b98de927054091e286 SHA512 b69000bb71d34920f46d981750e840af9c2cb89dc42cec9c3201cfdf1e8f2bd7358fd78810d7fc6a5e1c0fc6c91688f1d427485d86a388e1d9aae36cbb0f6c7b
 EBUILD haproxy-2.5.5-r1.ebuild 5597 BLAKE2B 4279dcf4971efc73c4e5b636e2d15fd4dfe754a62d1f197ce9f38e1626513df92f662e78c648a6c21c15ae623cf95b2b310b7ee61a70bee84b6822162ac60b19 SHA512 447c3ec8b502d8dbc0aa5b8134f7b0a7910b34815f2c819b1d6c1e2f480bcc2f5daf6a2f80398ddb0633f6bed34861557b4e9452cf928fa7d19a89c7691976ae
diff --git a/net-proxy/haproxy/haproxy-2.4.4.ebuild b/net-proxy/haproxy/haproxy-2.4.4.ebuild
deleted file mode 100644
index 08d54556db63..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.4.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc x86"
-else
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	pcre2-jit? ( pcre2 )
-	pcre? ( !pcre2 )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	pcre2? (
-		dev-libs/libpcre2:=
-		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest
index 69241b6056a2..e1bb9f926174 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -1,32 +1,4 @@
-DIST git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.mod 45 BLAKE2B 2eaf520004fc4a4a3283bba8b12bca561c042fa9ac35be8d152f232b71f8431b099f452edaa2ecdfc54e56d8de989eaa46f1d21428fbd1431d6e52fe353aaed4 SHA512 7f919bb78329c34c2e2c667fd4621885fe8ef3ed7b916de65ceaf4d6fa739fb540c2f453a16cf6f5add0f0540d06e0c7cf1eb92a2d3751bba2cc26ea285756a7
-DIST git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.zip 39367 BLAKE2B 451710920a0fb77caa7cc1a22284faced216d54eb0fe77d70e375ac063c91d7c5dde17a85bacecd06092f1dce7d28e19ddaa28408a95954e76c6c4d4fb4a2bf2 SHA512 6b0f5ab0b9d99f2bd1acf140a8d16ad247743a3989b1a69ef9377aefb860f6d73cae911aaf5c21a251aa668b45da946d6a82321bff9918efb8044794c69d5697
-DIST git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.mod 59 BLAKE2B c741382a34677abe777f42d88210a2da3ba6dfaebc557e28d1a49a5f46822d94838469b7d7b72476b45b55b0c557ec132cbee805173c5607a6cfcd2b2e090c1c SHA512 15340017e0579bd8d102bda61ea62c5b894fcaca9f320efabacd7a2158fc2beb28b686302a3002b53765004e9a0be08deee8618f8ad662ddc2430d0b2d78d91e
-DIST git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.zip 32116 BLAKE2B c9d113cc09a7da3e8c6cb56001633dd31b793f275596d1fb46608929b4475a7787b68239f7044096ee9301fe7be3e55db61d42d88e870227ef2a8c37e294077f SHA512 81a1ea071d7561a631c55844395f8d8d8773f4d8a5ea25e2c66ee2bb17bde8f79ff29d5d87f2bfd7ba42a31907c923f8f8616cd8fdaf21d99217ba1bb4c117e7
-DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.mod 30 BLAKE2B e89977c245471f14f3e2e9434d08e9683a9d4ad350dfde2055098d913fa41ca92c4cd8f26345f3c5b07ffea825b4a87d5d06f1ca99105456aa63091f00cba1ac SHA512 ae14432db61f891b7a8d6d8e51c47675deba7a13f0bd392536cecb625f6f9eab5b253d6744957dd0cca3464f84bbbcc3a41fd0f2bc25fe47e6d6b4ce51858930
-DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.zip 104690 BLAKE2B 7c52d737b8bf2f9a4b4ad4a7b2a843b715cd991dc18d61b0c2c68ec25ef8f8bc00ee0b5cdc95b91a1c64715d1990597dafe29c070a090227b2b7d1244a8b80a0 SHA512 8d15276c2a6e82ae72d903946fbcb2adc6446b964492d8c5653fee885e4c1b1d75f119a3fdcb0a35044929810d31420ac218b7ec077d1d07acaf2f586d869854
-DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod 33 BLAKE2B 8a7ad09e58eb232d947fee3583f03948dda02432dc94ae8916330347dbce328b9e1e445aa96b9ce00cb770583eda50344d160662eaee8f2d8290fe1c63511bdb SHA512 e9671d1c7e7aa422e139098e1977bdcd61f48b382d75a7234cdb3849eec4232b0cf7528ed37d534430317f7b2649b3c5b3476a23c0aca735279940f89fae11ef
-DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip 17069 BLAKE2B e70bcfb611691e43750b11f6e4e655ead44526d3c72a5bcbbb18732e0f23dd891da22b7f5961baae4cfb9d3d0e07af60f5a6afe48e3241bafef76333ef901f0f SHA512 fb9f43083ab6c28d26cf729ab56ca3e85a876fa50bd445f714da5de404578f35ae094b7619a6f10011f98b442137ebbc016b639138679fffff28bcc944e05e55
-DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod 230 BLAKE2B 26d8e2a5e9603273dd84ed9aae1bcf49e1fece530a5dc41cae3b5d2ca8bb4288023ac8eeedd0ecc76fa355bc9dd808d06196db03ccda186df5184fc6134e121b SHA512 132067629eb47d7ba22dcedd81467693f7abda7b050244bac8b8ddc9f8dec5d1ff4fd64a6ed0ed1537f400c516594df0f3a2aa392258dfc817176e4030f81cac
-DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip 10103918 BLAKE2B d484c7a50585a27d9910c4f9c4c0f179346bea4f373c0fec5b6af24205f69ca6afc4dda6f9b069f23617487f8edd7422379478d88a5a1e113104098fb2476cf3 SHA512 5c16e51cd71051795ca20e338b3eb4fe17e423fa26c4e188d966761ee7d23cf5b21d37a6cca7faf8f31c3110289d2da4e18e6777b8b26cc69563b244d94fc17d
-DIST github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod 30 BLAKE2B 3601cf72262d9c828eff3520a9375eb981b2a9193aee46e93406d491cb8db7b864c3eb32f65f02b75284170856b2264a1a24cc63196695e58365210b216cedbc SHA512 36ff5f52bec7fbf395cce04f20bc61cbe4e5f77ed550a5a869967d1e145e2dcd8e7bca23c3cf81882d8f7053e566dd95e78e97cdcf06c1556b78a5b9b51662d1
-DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
-DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
-DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
-DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.mod 330 BLAKE2B 12d6ca5517b27cb05da57741c8bde2601c14a0fea76a8df627681038e03095cd3f9a6cc0975837271deaf469715b510ea8d04d943f8ded8a9b36198bdfcd5b1a SHA512 db40c5be3fa8f7320ec134b3b801022dbc1b5d80cc9eeeb9366724bcd0df479e702d72a42f28cd2c9353e35b2e78a2ad95c0b575bbb5cad0ed04fd1cb629c84c
-DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.zip 818363 BLAKE2B ae79d47071ecded190c34851f4e82786d7db51cdd8cacf664fac543b95a77a55e7d1a308b2b9b09eb40ae0dfe8d55e00d4c8928ded0ec798e5a52ddd3f777f53 SHA512 dcb0ef6aa71b7d88fc2a5ee2b197e46c33d490dabb84a0a8cead68bbecb5b8bc36928eeae691754a7771f84c9a48975b0971c335d5b5086a013549b42cd87f44
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.zip 1781592 BLAKE2B 13d91c26bc1b3f13d8deb7ce2572853fae269db0f8384f94a8b59436d3351cb79f2e2b3ce3664b5c38e696be8ee67a7860aaedacf3019aa94079c160fb991fbd SHA512 42da234a20b3c6a8cfc83b3dce98d3fd11c07912e79d7943bfe6fd8baefae4756cadf5ec1688d4227d7151653fab29fc4a27fd562766f9fb10c758602d5b6f57
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.zip 1276380 BLAKE2B 95b24bac24917089c0140ff02154cdf170b1d459cf77b0ca11b15c778040d58e1b4369d7f7c5e913cb3b19b8cbedf202eca28b8045df054317a8a3bfdd14759e SHA512 ee4d522713f90dd3bd7942655b0b2e9a64b0f6b8cfa491be7f22216c9e016b3b1131da5dee2ff0eefbdef000ab041e64e0a9385239db20135cf6101e8d2c23fc
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.zip 1605582 BLAKE2B 35ea8cfc90f9986ee687b6f4d644d7af2ec786740e427534aefcbe8e5b7c725b4fec2d8323d09193aa4fdc98c8baa0ae42503164f6920e5de05bdb551e33bf35 SHA512 160668e809021d409e7447d83235b127275edd1601ed61f9975c585ea4b9900b2c3fb70c98d1a8addd0e5cae27840da3276caecd77bf168f1625641b03ed689f
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
-DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc SHA512 3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869
 DIST obfs4proxy-0.0.13-vendor.tar.xz 77920 BLAKE2B 72a41e4d103d55382d275f4e55915916c2f291a73052f519eebd3f7b864cbbe7784a8b1904a946f658e2a3f6ba3705ea1aa7149fdff5f4fbb5a2977e83ca6719 SHA512 7153130fdf13aefcd10d98a240d7f2f85e8ce1a5333ba2f68daee8fe03967b67f96442d5473804b9744ca782732c86265b3661378848669cb187938d8e1acdba
 DIST obfs4proxy-0.0.13.tar.gz 86593 BLAKE2B 1ac3adaa0c1c4169635abc511f3232d22c3164ec28305725c1b3d64b5d61b8f30296d3bd6633ad81030f017e32b0b49fc6487784d2c39b0ac7e8075504519b1b SHA512 5be0eacba6848ba89e7b7b873741e39e7807745f4648af63a81000ce1d2380fb0632d4b04e832071ca8051312360a0b79bb8d86f1e0f02a8bb5344fbfeeaf3fe
-EBUILD obfs4proxy-0.0.11-r1.ebuild 2221 BLAKE2B 80035d87fb0628021b952b49f800d62fc217aa65182178f3db99b3a96b2710d2accb047a51c9b9b2d55ab4021ecf03565aa6458ee47ac3dfdf17fb20f8382bb1 SHA512 33885e4ca4653a6458fc560c88fc1921b6018361cf4bf89bbfd7401187e49910566357eb566bdcf13e6e8736c4b0d64c105d7ec56b1305b8f3c2bc1b77357160
-EBUILD obfs4proxy-0.0.13-r1.ebuild 997 BLAKE2B efb8895213a5966db72d5350d3031419436e91db736ea62e4b8690a12937f04cf343646043f8c348d911a3af0dbdc5fa1cde651fb191996a9fce25c1dd81711f SHA512 bd0831a97140a46c74db0d3ac01d3acd46bf40f4d9e4cd9073e34542bf3ab2c4b467bf266d480c94f686eb663834cafec624d49547dec9362c803900d8963d7b
+EBUILD obfs4proxy-0.0.13-r1.ebuild 994 BLAKE2B 435fffdb8fdd8a489087018cd9628a7d0200718faed583d46f41b81e35ae14b9de330e465ece9db7cb27104407e966147e05b37ccdf3bcf3d8390e70ab3f34af SHA512 f669360661e24643429cf094fcccf66ff9eb7b838b9ec9a6db970e98e3146c1706c6d51d5d3f6e2c6e7c616c935b3488b99bba52171b7e02371eaaca1da8d844
 MISC metadata.xml 437 BLAKE2B aad226fe4a4891683070aec2c5726682c0622dbb85b69c94caf0c830ac9f3b891341f80200fadae3b71ca1bc545a6269237cf90c6413ffba98462bdbf64dfdff SHA512 cd0d8f64fbb0fda5f55e6bf2f0bd9e2d1b13e5c8b7b5934bb7a3180219fba7c63f2c2a16abb5906d4d2a4e5222473fa67723c9ae3be0fac08321235b96f4d845
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
deleted file mode 100644
index 89d05eaa48ac..000000000000
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4"
-HOMEPAGE="https://gitlab.com/yawning/obfs4"
-
-EGO_SUM=(
-	"git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6"
-	"git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6/go.mod"
-	"git.torproject.org/pluggable-transports/goptlib.git v1.0.0"
-	"git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod"
-	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
-	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod"
-	"github.com/dchest/siphash v1.2.1"
-	"github.com/dchest/siphash v1.2.1/go.mod"
-	"github.com/dsnet/compress v0.0.1"
-	"github.com/dsnet/compress v0.0.1/go.mod"
-	"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
-	"github.com/klauspost/compress v1.4.1/go.mod"
-	"github.com/klauspost/cpuid v1.2.0/go.mod"
-	"github.com/ulikunitz/xz v0.5.6/go.mod"
-	"gitlab.com/yawning/utls.git v0.0.11-1"
-	"gitlab.com/yawning/utls.git v0.0.11-1/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c"
-	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
-	"golang.org/x/net v0.0.0-20190328230028-74de082e2cca"
-	"golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65"
-	"golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-# See https://gitlab.com/yawning/obfs4/-/issues/5#note_573104796 for licence clarification
-LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-S="${WORKDIR}/obfs4-${P}"
-
-DOCS=( README.md ChangeLog LICENSE-GPL3.txt doc/obfs4-spec.txt )
-
-src_compile() {
-	go build -o ${PN}/${PN} ./${PN} || die
-}
-
-src_install() {
-	default
-	dobin ${PN}/${PN}
-	doman doc/"${PN}.1"
-}
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.13-r1.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.13-r1.ebuild
index 52d3a111a4a0..6036d84649ef 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.13-r1.ebuild
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.13-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${
 # See https://gitlab.com/yawning/obfs4/-/issues/5#note_573104796 for licence clarification
 LICENSE="BSD CC0-1.0 BZIP2 GPL-3+ MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 arm ~riscv x86"
 
 S="${WORKDIR}/obfs4-${P}"