gentoo auto-resync : 22:09:2022 - 17:28:08

10 files changed, 7 insertions, 371 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 4d98494f2b89..34f3b2b6e82b 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index de4af1408935..c248dd5bb7f3 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -14,25 +14,21 @@ DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 1ec312a5607634f7906cfcf5d4e22d829bdca
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50 SHA512 95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c SHA512 cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710 SHA512 99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
-DIST haproxy-2.6.2.tar.gz 3978933 BLAKE2B 8d080b175f574718fac6c58b9681a50d40d8ea4a562a05466668ee9ebe95c065aaa3eab33115c69cca356207f91927c2b949c0ec7d354fdad413ae91a41e60cd SHA512 8eef882145ce8da409d2fbd6fa5b7d383b9d52f8147ef697d61c512c07a8aa8029ae742b5682af5fe736c34398a5265ce9dc189e938f47395cf9e775471b5f55
-DIST haproxy-2.6.4.tar.gz 3986583 BLAKE2B e4eb9c576aa1405bd07359488d4defaa765d7e802a62278f784de8fbf4fbca67da6cd4690917534c7a7e1e9979c727cbfc021f1a5676dec3f47b8f295d61a5d3 SHA512 f6e20e164ef3d6e81a85c272806ddae94c1d1cbd800dfeeaee3818ed7987ee6e59797c235c53efc51905da707d238026fbcb0a44f0de29e76f4eac7beeb8d035
-DIST haproxy-2.6.5.tar.gz 4010014 BLAKE2B 310556ace0fc54537e7cd91f7055c46f172355ca6eb9bde92f2fac6bf3d0c6ee60036e5744f67421b6d910f5719d4b6ae91e0737d95312d2dfef1760f2c354dd SHA512 b285345be866b25a645b8d417cac0f9b2c9ed473cd327a621f549e77cbf0600a94e39868bb83d24a5c2ac49fe94990e37030bf3ad6f5874fb6b150f16a701731
+DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7 SHA512 0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2
 EBUILD haproxy-2.2.17.ebuild 5356 BLAKE2B 3e66fd23b24ac10f251ca4c0b20b9fc7f51c55a7235ea362b22f71f9e581c36c93dcb4046cc14dcf687669eb64a71e221f7affd9e811cf94361e4e86754fb3bd SHA512 316ba774a164527afb0c56da9fe3433cc3c96becef081388b5756d819e0962d15a61d67388e9776ee194582a1e7dd97105ee58e194c94689047aad38b20509c1
 EBUILD haproxy-2.2.21.ebuild 5358 BLAKE2B 74e840c6a726c6c00e26de01e8ed0e9923a7a7623a9984a67a5d2322fe7be38eb26559cce3fc1bcfadeb00246e42c0ed076a2b2662776f596e14a8f9ab1f5d12 SHA512 2049483a3f1eb1907573fcb134d9cfff2b27dc50a45df9025c3e734a1bde76d4cc7f5c0affdf52877889d267b32bb1fcc402dd1f8d9338004e9aac2aac879dd7
 EBUILD haproxy-2.2.24.ebuild 5333 BLAKE2B 8814d4213f00ee1a095d88361e4ec82530f29e6b2c616cd5953dbfb2a1a5e286f83c5995e6344e0f49cd1a9b057cc31ab9b68034587ff716e09d97227f1eb4f2 SHA512 359a68d2054f4260d0b375d46e19ba391aee72e6cbe5e51e8c098916b42e229372830668bccf44935eea81f01848d76751df85a00f10de74df0a86785b624490
 EBUILD haproxy-2.2.25.ebuild 5335 BLAKE2B a22d724c3f0297085e6feabb79a9ce77419d1290334e0b0503e5e066d5c19f60f655226985afecbb073cc6614cd8c99a5f8741dc1d7d885352de36581d55fc82 SHA512 9e005d1af2697e1b717821d27460204355b0d2c2eac6fda62c8b2cdba12c232b5e5cbf7717901a87af9a5a58f872f6b78ace9b37a00df8e6926861e94864f282
-EBUILD haproxy-2.2.9999.ebuild 5336 BLAKE2B d2de168b66696613c932d3ba2dedaa5907ac3f069ffa03dbf133bd0e94907e139e943648215349a41e666d48e1e321de1767741236b82a4e06d17947312bb58a SHA512 fbd6e795ba02e7418bd2af8b103254332db134779e66a6b57ad8ab831ffa9550005948193315c3906e385cc5bbe22372b4c3b2f5733fb690c3c98727df1d6c2e
+EBUILD haproxy-2.2.9999.ebuild 5296 BLAKE2B 72ed307925987606f8de230a9f68ed8a8deeb150ea298e873d16062bfbf40d15c2e01bd5a3a99c093134f932d96cb0c5f6f3f4cfdf65fa796f1fcf3936d6bce0 SHA512 d9c6c8c8c17abfdebea17522aeeb4bea21993691953e29609185687c5483377f9a0340bad1c1bf7d1b3c26a5224f728082810fa276e4b54e1ea5756497d5548c
 EBUILD haproxy-2.4.14.ebuild 5603 BLAKE2B fe8ce7c4e262f9c7ec28b0409192a4165eaba2beb70eaea23affe3623eb0c977a6402dfca1bc70e48e09441a8918caed2632c63855963799eb8d9cb3b07dbf10 SHA512 2d10f3f0aebc2ca6d8cb0835a5b58a37d74b19850e80be1b819256a330bd1d14666fddcd8f0f80551cd426e015953f44d4cabcf95fccc8b95bae9b7d41f91a97
 EBUILD haproxy-2.4.17.ebuild 5624 BLAKE2B 2bb250df90ffe2f545ae3767ba91fbcf435a1fe7403463d2a875454c2d0c871ebf7e1e5572af78f47d2767511fbb70e35c54be50b93073c6a649b985e8c9440d SHA512 262bebe786f159b771fc582cad856620c9b13fcf26204fcf19fb199753d7cd59de29a93e4d97e1a02be1f172ad41e113891fc7b96dd25416397ba8cdd86f47bb
 EBUILD haproxy-2.4.18.ebuild 5580 BLAKE2B 97d8b35496b54ea7f64fd7f800eadf651fb324abe28e54bb3f85da2931072dbb1685795deb32dc88b8ab382216d460cf611cc96e577ddf084e71c4424b654c44 SHA512 db19c93d1c2dc3087db591ebb5d4a0934583c4f9dab8514e0ea3377a7678837e5beb30da7719913f02f2a3e2e9c5a36af5d368b334caeef0d4cad38926038da8
-EBUILD haproxy-2.4.9999.ebuild 5581 BLAKE2B 576b060f630da2a0060035868be9960aad9ecefb7205a49725a504e53fa397e800e0ce039d6d70ea771d67927545f73b8729694bd9876003a57e7c8a8e63944b SHA512 02f33f590bce955547b07a7b1963ad8b8e745736dd90d106835e31f83e091ebfb51d27ea6331c330e58b93d6ee82b08875f47e58d4e488b196d7b5d8100b4a8d
+EBUILD haproxy-2.4.9999.ebuild 5541 BLAKE2B 31a6af0a9d420d4157b6eb68838efb24acd70988aa47e6e84e1655627fae7f756c7c43046d12c1fcbad69d35e2efe814bee37c139cccc723f6b56dc88e6e7c79 SHA512 1177a12102250f6b85116acf079522f3cd79348e387c080c2ad0cc707ce9288601a7e32aea13ba4805aa9860c097d96f01a5408a472bfb38f27a51d3d72a3c04
 EBUILD haproxy-2.5.4.ebuild 5603 BLAKE2B fe8ce7c4e262f9c7ec28b0409192a4165eaba2beb70eaea23affe3623eb0c977a6402dfca1bc70e48e09441a8918caed2632c63855963799eb8d9cb3b07dbf10 SHA512 2d10f3f0aebc2ca6d8cb0835a5b58a37d74b19850e80be1b819256a330bd1d14666fddcd8f0f80551cd426e015953f44d4cabcf95fccc8b95bae9b7d41f91a97
 EBUILD haproxy-2.5.7.ebuild 5571 BLAKE2B 4a356c40d93c8f3aa2c88cb37bbe541fa897ab0fe0b7bb88302288c7b988d68e08f71a74f63a007b4fe5e701ffd74b44afd40ee8f7574f1d56ddce2259ab858d SHA512 33371bd457ddbfbd4e63d36a08841a1567ecac63cbebbc318fda193b634899deb6471b1c17e235655bd6152138f8360d7ddf1751d578b6e736233d181dde40bd
 EBUILD haproxy-2.5.8.ebuild 5573 BLAKE2B fa7a020def7236bffa5f12e3ee7c994d7f37fe3bab6b3ee2d6ac58a2c3be713f806ac5b0f6e15e91b3df7d3536742cab175fb6aadff1b5dd8449af83bd50011d SHA512 2c5951ba57f008f6a3babda4c272fff26f7502e1aefc6f5d54a98759e077b23cbca8f82c83e3bd28152f15cb8eb40bfa9c4e053ce7df771a1d9e5368e3d1e322
-EBUILD haproxy-2.5.9999.ebuild 5574 BLAKE2B 0745336c121fa432739cc6de7fb16c0ce610adc5b9fe24e4e1e197fefba04bba9a4f53939caf7482335690159beef8e53d1c063e968f7562801e3c4a1d20031c SHA512 5d1fd311ea9bc6c542e525146bcc4fcad608f4602ed5e813e2021da13490c9e05cd9ee7b863ca627bf04c9c7ed1f00da7f00dd5d7e6e463abd54cd226d1a5f8a
-EBUILD haproxy-2.6.2-r1.ebuild 5573 BLAKE2B fce77648e3fde52958f5153b5ce74f57e33a3872b0e72efe9b4ad1eaf04a91467bc634a9e89d5d099d99bea23ef4b99afe3e8830e94726c0864986c6e189205e SHA512 5c14c725a4327f44996ac3d51ac9009602283717ad713f9cca4a4a9ef110af782b6da4f24db52c711d97a3cdfe71c65504e7d76490fc4706034e66743ef722ce
-EBUILD haproxy-2.6.4.ebuild 5573 BLAKE2B fce77648e3fde52958f5153b5ce74f57e33a3872b0e72efe9b4ad1eaf04a91467bc634a9e89d5d099d99bea23ef4b99afe3e8830e94726c0864986c6e189205e SHA512 5c14c725a4327f44996ac3d51ac9009602283717ad713f9cca4a4a9ef110af782b6da4f24db52c711d97a3cdfe71c65504e7d76490fc4706034e66743ef722ce
-EBUILD haproxy-2.6.5.ebuild 5573 BLAKE2B fce77648e3fde52958f5153b5ce74f57e33a3872b0e72efe9b4ad1eaf04a91467bc634a9e89d5d099d99bea23ef4b99afe3e8830e94726c0864986c6e189205e SHA512 5c14c725a4327f44996ac3d51ac9009602283717ad713f9cca4a4a9ef110af782b6da4f24db52c711d97a3cdfe71c65504e7d76490fc4706034e66743ef722ce
-EBUILD haproxy-2.6.9999.ebuild 5573 BLAKE2B fce77648e3fde52958f5153b5ce74f57e33a3872b0e72efe9b4ad1eaf04a91467bc634a9e89d5d099d99bea23ef4b99afe3e8830e94726c0864986c6e189205e SHA512 5c14c725a4327f44996ac3d51ac9009602283717ad713f9cca4a4a9ef110af782b6da4f24db52c711d97a3cdfe71c65504e7d76490fc4706034e66743ef722ce
-EBUILD haproxy-9999.ebuild 5573 BLAKE2B fce77648e3fde52958f5153b5ce74f57e33a3872b0e72efe9b4ad1eaf04a91467bc634a9e89d5d099d99bea23ef4b99afe3e8830e94726c0864986c6e189205e SHA512 5c14c725a4327f44996ac3d51ac9009602283717ad713f9cca4a4a9ef110af782b6da4f24db52c711d97a3cdfe71c65504e7d76490fc4706034e66743ef722ce
+EBUILD haproxy-2.5.9999.ebuild 5534 BLAKE2B fc75ff57aeff28ec1cd47fed8bacac7ae7e5052645630a23964d972599e6d21f1f16befbc5b5f80d4f1bf123d66ec8d820bc1b1c4c9d88efaa3a719d5a87ed2a SHA512 0fb59637589811975b5e7b179619a8224f5c878729b01c5235a78317460b5bcd816c2a2edf4e2ee9c411cafa73d4d993c5278bb3063de732966f5f279cb596b8
+EBUILD haproxy-2.6.6.ebuild 5533 BLAKE2B 35d1fc865e5b8fd84268bcac1d2c3f210c88e14fc546dafa943a892064b727b0181b4b2551fc13a389be23da5db288a91213c399b152a85a468827b3a03776d6 SHA512 2bcf1079cc9d0b9c132bda399a8dde03306e93671c8a626da4b366657f93d7be171dd209e99887054a52ea2a0ae618f76088bcf485dc094c0a189d0b5d661839
+EBUILD haproxy-2.6.9999.ebuild 5533 BLAKE2B 35d1fc865e5b8fd84268bcac1d2c3f210c88e14fc546dafa943a892064b727b0181b4b2551fc13a389be23da5db288a91213c399b152a85a468827b3a03776d6 SHA512 2bcf1079cc9d0b9c132bda399a8dde03306e93671c8a626da4b366657f93d7be171dd209e99887054a52ea2a0ae618f76088bcf485dc094c0a189d0b5d661839
+EBUILD haproxy-9999.ebuild 5533 BLAKE2B 35d1fc865e5b8fd84268bcac1d2c3f210c88e14fc546dafa943a892064b727b0181b4b2551fc13a389be23da5db288a91213c399b152a85a468827b3a03776d6 SHA512 2bcf1079cc9d0b9c132bda399a8dde03306e93671c8a626da4b366657f93d7be171dd209e99887054a52ea2a0ae618f76088bcf485dc094c0a189d0b5d661839
 MISC metadata.xml 2063 BLAKE2B ddd51cff72847b617a457ac2baee4dd18a90a6a23e0982bc932ab8d3d101312dc2265884d38fcdc1a1cbb3d982b078e5b03a3c13fce07568d9d477688d210b09 SHA512 2198d3735f32f9c22787b1b43fd59bd6a0018ae25e104ee34ce0f27682ad8d6405a37c1c890b5eb41deabe5a5011d07d379e5df780bd8ab2877bd435bb875a1e
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 954368323612..c3fd5e9e2c2b 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -122,7 +122,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 56ad7268073b..1ff5a7b10e0b 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/net-proxy/haproxy/haproxy-2.5.9999.ebuild b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
index 853340e4fcb2..ba2ff38efb00 100644
--- a/net-proxy/haproxy/haproxy-2.5.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/net-proxy/haproxy/haproxy-2.6.4.ebuild b/net-proxy/haproxy/haproxy-2.6.4.ebuild
deleted file mode 100644
index 6e17e38ddf96..000000000000
--- a/net-proxy/haproxy/haproxy-2.6.4.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 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"
-elif [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-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 prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-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
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-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-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${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 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.6.5.ebuild b/net-proxy/haproxy/haproxy-2.6.5.ebuild
deleted file mode 100644
index 6e17e38ddf96..000000000000
--- a/net-proxy/haproxy/haproxy-2.6.5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 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"
-elif [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-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 prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-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
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-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-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${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 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.6.2-r1.ebuild b/net-proxy/haproxy/haproxy-2.6.6.ebuild
index 6e17e38ddf96..5d7459642b66 100644
--- a/net-proxy/haproxy/haproxy-2.6.2-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.6.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/net-proxy/haproxy/haproxy-2.6.9999.ebuild b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
index 6e17e38ddf96..5d7459642b66 100644
--- a/net-proxy/haproxy/haproxy-2.6.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index 6e17e38ddf96..5d7459642b66 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}