gentoo resync : 16.01.2021

8 files changed, 746 insertions, 2 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index d13a763b96bf..636385f92083 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 839e127d8b4f..0710bdaa07a8 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -4,18 +4,26 @@ DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B cd85d233623f2791bff8ada00d9ac4ea3743e
 DIST haproxy-2.0.26.tar.gz 2713209 BLAKE2B 9d33cc57d9b1761844fda05981ccddc4de6823a0c101b6fadf8ce2dbd0b1a76f2b4c2b6d5f9b656eabfc40af2dc750b81b922149583669f3e7001ba60525f488 SHA512 eae97096a66038fe8d5bd86b6a15ae679142593d3cb27ec0fd495fc16b926e58c9a25a6c050a310c450c7c167ac20fad46c60f31fe58dc1a1da11d987e8eed17
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67 SHA512 174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
 DIST haproxy-2.2.18.tar.gz 2940789 BLAKE2B e932c53b67052a2696a00cc9e0ee79ca2c7bdc5ba51bbb6c5bf3e7d5ef8bcf3c4e0f6524d40bcbc3342f86c3ddec6e27a0a2ad329ee5ad510260dc2f24b3913b SHA512 255b5d5984578a8d018b80e213ff2bca583de30d835aa3de345fabb05c229277d18007251b441dfdbf863e0297a2fa6e08e41b7b57dd76eba7f2e50879ae2cfa
+DIST haproxy-2.2.19.tar.gz 2941835 BLAKE2B 9bb7d75b598b075de56c4647d954c1aa8e277de49f9938eb7e759b65ac59b6802561a29a206caaf6076d2d6111b1b0b39b7c60584e4389273d22525be28895e8 SHA512 bd27f6fa3555a8d1c0f9ea91132ea474e54a176847e090f3e2296dbc8e9e98ef3dbcc4440abccf5d65c8b8afae33e8e5e5472002a9abaa63de3eed4056e519f8
+DIST haproxy-2.2.20.tar.gz 2945047 BLAKE2B d2462b3c43e75f86752bcc0edf3af173fba10f9d8191e715b15c926bffb6018b495a54e3f9883dfe6cc80f33cd5f362ac1e2db88f9d0e8b85be74c1fd28dc21a SHA512 53b8466b3717dd5e4d167d48ae449da6e97b3a6d9a06951f040aec34685b961a7014137a5e4d285bd2b8b6eaacc3028f1939c66f450775a01802df085d70a098
 DIST haproxy-2.4.10.tar.gz 3605085 BLAKE2B c42bd0241b9bb6d5fd5d566871f9ade943530175cdaa399d1a9583d25efafb0e7fb067143d5bc99d0705b0264691efc57021adecbd5bfe5dbe42d1eebdae60c8 SHA512 116739dbef44164e9e7bf56855bebcb09a7678df688a607539aebde330844d4ae110b9e9e2f75b70ed7147d51154566968972d19ee6d45936bb3d0ed79c7d348
+DIST haproxy-2.4.12.tar.gz 3607497 BLAKE2B 8e66c09ff29dddee61603f1b877ee427f20f3ae1d1fcb5a2659c86bd6a91f48745c17147ebc995231e398daf307e5757e940cb34b6f337ac4afe81965fd110d7 SHA512 bb5cf9894cab051f96c067203842e7d6277bc02c825061e483b7678ca6e70d01fc3f6d57e9cc9243b57feac97967b09467e463c7dd7ab44700a7af2087a559b6
 DIST haproxy-2.4.4.tar.gz 3587306 BLAKE2B 983f5919b738419d616b35c1cad6aa2400b0b857160ecfac3bcdfcc14c15280283ae3f33036652a3a9b5bfff0fbb6a54912807ea7c83c828d2b5ba72274fe1a8 SHA512 a8987e8342fdbec7e48de09a4391a67e77e05493260e0e561e8c185b6457b8e1086cc45ce04ebf3365699c008dff81667490e2fe99c33c0ac3c7513df8ae025c
 DIST haproxy-2.5.0.tar.gz 3803196 BLAKE2B 271661f685f4aa885e3cab75c4a0abeb9751a7cb4ceec3a71f475e75b635f8452857dcaa7b010c8d0621becb3ff7f5d49af8d7d758b30829ae99e153ebc85b56 SHA512 70068962a434e9ba4b2d7595b929aec618ee62d51935c9836f2617e639416e50077495bbf08dabbe7dd49f2d4e3942e55a96a5de33a7846377972fbc3eedc1d0
+DIST haproxy-2.5.1.tar.gz 3811260 BLAKE2B af36d05856b87a9f784275112e66b26708d0c5d0cdc3e28bb1b837d3a2996f3361664e4d38267526684e6f93daf09685f61084ba82892fe9e53415751b52f011 SHA512 d0ef80e68b99c3dd2f286a18a4061f1fc6dda5aa501c80d42a0fe97f6bb88d7f7999da6f7ff97b2c318c9ec5fccffd9cf5b2eb4cdf1cf1101b4f002da27f4e5c
 EBUILD haproxy-2.0.25.ebuild 5486 BLAKE2B 2ecd95883ad3d19c067d07493bf9cfa254fed562798002d8640d9ca754f2f4c415b58aed405547107332ff9ca8404e2e95319735874e455a98087d8d236c5500 SHA512 4d77e92faebc06ecf562e52a02cf1b11b1ca77bef89347680372d4f9cadf1fd6e7c2f737582232630f981adb43be40ab222543794f82c11d656550953da4eb08
 EBUILD haproxy-2.0.26.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.0.9999.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.2.17.ebuild 5486 BLAKE2B 2ecd95883ad3d19c067d07493bf9cfa254fed562798002d8640d9ca754f2f4c415b58aed405547107332ff9ca8404e2e95319735874e455a98087d8d236c5500 SHA512 4d77e92faebc06ecf562e52a02cf1b11b1ca77bef89347680372d4f9cadf1fd6e7c2f737582232630f981adb43be40ab222543794f82c11d656550953da4eb08
 EBUILD haproxy-2.2.18.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
+EBUILD haproxy-2.2.19.ebuild 5490 BLAKE2B 236bbab38c660af5389f0f91ea178c04b5d29add2e49f0de8e0be1a73fcb260fe0540b6a9ba4d76db580ff4855c10835403060df58204897ba5dd1bc7ecc2ebe SHA512 0c0f365b72d16924823ce5aafa6d568e62535b70b09b7a08241a5138b66f8ab0fcf38fcef6ad8f9d2ad73e2555f484453af2944de4dae51f0db1d217bf2d8a84
+EBUILD haproxy-2.2.20.ebuild 5490 BLAKE2B 236bbab38c660af5389f0f91ea178c04b5d29add2e49f0de8e0be1a73fcb260fe0540b6a9ba4d76db580ff4855c10835403060df58204897ba5dd1bc7ecc2ebe SHA512 0c0f365b72d16924823ce5aafa6d568e62535b70b09b7a08241a5138b66f8ab0fcf38fcef6ad8f9d2ad73e2555f484453af2944de4dae51f0db1d217bf2d8a84
 EBUILD haproxy-2.2.9999.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.4.10.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
+EBUILD haproxy-2.4.12.ebuild 5709 BLAKE2B d6b95dcc7a499124e52497eadf14d182970450bedbae46be4962456b3f4f1d44c8b0bcadd83d7a59b72ab0a283792884cb218b3e40f585ed3efaaff032845a78 SHA512 ae14793bbd11f34d34e29d70b7a604dcbeab18f1cb3d603dd312004cdb5478f0306d15d9dcecef6858cf087361111c710dd20480ffcea912cefeee3e764eacf2
 EBUILD haproxy-2.4.4.ebuild 5705 BLAKE2B 9fbf9a8c3104e5fc2562d80a821fcc23e2d092eebce50f4ff91740affe4a5a03ab51c737f32e491aa1c807b7c81c85b19c03981bc56ca21d6de6b74246a50d29 SHA512 993f85aa9f17a9d268eb41e54afd92f8425ebc200c3734e128ff32984904ce1e93bf640a2848f80a4fca847583d2b3d9ee5f6091dc8f9ea25c8f4ac8d1a41503
 EBUILD haproxy-2.4.9999.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
 EBUILD haproxy-2.5.0.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
+EBUILD haproxy-2.5.1.ebuild 5709 BLAKE2B d6b95dcc7a499124e52497eadf14d182970450bedbae46be4962456b3f4f1d44c8b0bcadd83d7a59b72ab0a283792884cb218b3e40f585ed3efaaff032845a78 SHA512 ae14793bbd11f34d34e29d70b7a604dcbeab18f1cb3d603dd312004cdb5478f0306d15d9dcecef6858cf087361111c710dd20480ffcea912cefeee3e764eacf2
 EBUILD haproxy-2.5.9999.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
 MISC metadata.xml 2149 BLAKE2B 477f1df5845a701354bf2efc6f4b61792272c96ccdef50c997a8f8177640e170e81b448fa6be597fba8d32f4657ef105c2a5a9e3aa9681eab25589c2c1ebdb94 SHA512 95cc58d090b0f1a2ef7d3ab0f51074887a837394c826721490a4a6eee0695e64833bb4e04f308c55335f719ef3ace5507546fb9fbc1477919012d70d2d3f01a4
diff --git a/net-proxy/haproxy/haproxy-2.2.19.ebuild b/net-proxy/haproxy/haproxy-2.2.19.ebuild
new file mode 100644
index 000000000000..3f411c90b78f
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.19.ebuild
@@ -0,0 +1,186 @@
+# 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 ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://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 device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
+	device-atlas? ( pcre )
+	?? ( 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=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( 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 device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	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}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		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 contrib/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 halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	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 contrib/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/haproxy/haproxy-2.2.20.ebuild b/net-proxy/haproxy/haproxy-2.2.20.ebuild
new file mode 100644
index 000000000000..3f411c90b78f
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.20.ebuild
@@ -0,0 +1,186 @@
+# 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 ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://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 device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
+	device-atlas? ( pcre )
+	?? ( 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=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( 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 device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	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}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		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 contrib/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 halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	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 contrib/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/haproxy/haproxy-2.4.12.ebuild b/net-proxy/haproxy/haproxy-2.4.12.ebuild
new file mode 100644
index 000000000000..ba20ee3537d8
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.4.12.ebuild
@@ -0,0 +1,182 @@
+# 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="http://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 device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
+	device-atlas? ( pcre )
+	?? ( 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} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+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 device-atlas DEVICEATLAS) )
+	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=${ERROT}/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=${ERROT}/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=${ERROT}/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=${ERROT}/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/haproxy/haproxy-2.5.1.ebuild b/net-proxy/haproxy/haproxy-2.5.1.ebuild
new file mode 100644
index 000000000000..ba20ee3537d8
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.5.1.ebuild
@@ -0,0 +1,182 @@
+# 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="http://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 device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
+	device-atlas? ( pcre )
+	?? ( 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} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+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 device-atlas DEVICEATLAS) )
+	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=${ERROT}/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=${ERROT}/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=${ERROT}/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=${ERROT}/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 1387dffae8ef..1ffe1c7b348a 100644
--- a/net-proxy/obfs4proxy/Manifest
+++ b/net-proxy/obfs4proxy/Manifest
@@ -47,5 +47,5 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLA
 DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc SHA512 3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869
 DIST obfs4proxy-0.0.12.tar.gz 91214 BLAKE2B a4e4ddd0055f3e914beba227f977a896439357b8f14798539fcaaf628d57f69c085c6fb631168aa8678f108732b10aee33ef1c4faba8392005f7d9083756e132 SHA512 7a00fcb4d90e372c9db13effe0e490d4bb7c6ba250451916419efed47b507b5da51b0edf4711eb5433a8c9fb626cdb2040ce066189584fd0625215df9cc06496
 EBUILD obfs4proxy-0.0.11-r1.ebuild 2221 BLAKE2B 80035d87fb0628021b952b49f800d62fc217aa65182178f3db99b3a96b2710d2accb047a51c9b9b2d55ab4021ecf03565aa6458ee47ac3dfdf17fb20f8382bb1 SHA512 33885e4ca4653a6458fc560c88fc1921b6018361cf4bf89bbfd7401187e49910566357eb566bdcf13e6e8736c4b0d64c105d7ec56b1305b8f3c2bc1b77357160
-EBUILD obfs4proxy-0.0.12.ebuild 2801 BLAKE2B 9ac648a83713d447f9cdc1f9cd7c2045afc0540b7c4c162bd90a55d9a9f5be705565956cb7ff1aa2eed704890d2a466eec43eb8239a50032d0da60140df0c5e6 SHA512 3d61d9b0e2253e8fa094fdaed41bacaf5456531dc3bbaa8f4f9734b97b820a8932ebaa4cc88a48526dc5be84b5c8ac31debfe0c8d505e6f97334c8ffaee3520a
+EBUILD obfs4proxy-0.0.12.ebuild 2808 BLAKE2B 74613fc5856245b5d1055a7137465237ec6c9ca8bdc7531ac5903df4d8ce4a73d57ae43b7072ab39c1a7fa13740eee8f790f05d062a6619f887976f4f04234f3 SHA512 21d9020655a5a804270a3052cfdc7c59670fa23bb3e8eebe620d56792bc3be85ca1e1f5b43c08e224e8f4c290dab10d6950371e5edd42cceebcffb6a86aea5f5
 MISC metadata.xml 437 BLAKE2B aad226fe4a4891683070aec2c5726682c0622dbb85b69c94caf0c830ac9f3b891341f80200fadae3b71ca1bc545a6269237cf90c6413ffba98462bdbf64dfdff SHA512 cd0d8f64fbb0fda5f55e6bf2f0bd9e2d1b13e5c8b7b5934bb7a3180219fba7c63f2c2a16abb5906d4d2a4e5222473fa67723c9ae3be0fac08321235b96f4d845
diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.12.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.12.ebuild
index 26e476080db0..5e2731b1ea6f 100644
--- a/net-proxy/obfs4proxy/obfs4proxy-0.0.12.ebuild
+++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.12.ebuild
@@ -53,7 +53,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 ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 
 S="${WORKDIR}/obfs4-${P}"