commit:     c8407f2fa06bbab7f8357e929ad671492f310068
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 07:53:09 2025 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 08:00:33 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8407f2f

net-proxy/haproxy: Bump to 3.1.2 and removal of old versions

Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>

 net-proxy/haproxy/Manifest                         |   6 +-
 net-proxy/haproxy/haproxy-2.8.12.ebuild            | 218 ---------------------
 net-proxy/haproxy/haproxy-2.9.12.ebuild            | 218 ---------------------
 net-proxy/haproxy/haproxy-3.0.6.ebuild             | 217 --------------------
 net-proxy/haproxy/haproxy-3.1.1.ebuild             | 216 --------------------
 .../{haproxy-3.1.0.ebuild => haproxy-3.1.2.ebuild} |   2 +-
 6 files changed, 2 insertions(+), 875 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 1f328d6ed8dd..28a6cb907eb7 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,15 +3,11 @@ DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 
15a33d6d88de9181d4b1b05d59d32f1c76496
 DIST haproxy-2.6.19.tar.gz 4110701 BLAKE2B 
fe003ac433a7756e57751db8f5430fb5f16e20d328bd28c0c5595304570a1450cecc19ca600fae515b21af00bfd6699ba08bd8ccfe43a09b6719e0f90b985a02
 SHA512 
cdcf6c2108d844c08b586e0e4ee4bd64dde3ef0da7487d65ea68f6fb52d9a1c2c34f4438ffacebea1d0f2400aac9f9f1b9000714a08cbac192a9f302dcc6c345
 DIST haproxy-2.6.20.tar.gz 4111858 BLAKE2B 
cddd6a14f82b4957a6b4c9e61b580772a17aa1698042578628267d5339d43a3805ada1721855de44b4202838734d479f434d857bf0ad3598776bdab5eb2b5f8a
 SHA512 
f52f5b7223d825455dd5eb415a69985a124c30e1bb2d04221c54d82f83c705e45e1b5a312e2d760f9991e0f09e962cd9b8454557c3e08700e75309e4b6ea30ac
 DIST haproxy-2.8.11.tar.gz 4400628 BLAKE2B 
0daccc4dbae5cecae3ad0bc1d164ea78a9584a0f4cb71e15664aff4b76fc05a828030dee355722c99a77270427bd3e9e43939ae59a3f3b1cabcc0179faff34b9
 SHA512 
59517187a5c0e0dbcb8629d2a922f7a865e1ebdbb9fe0f4fbe273913e0f15a1a26767808bd1607f10e79d3abcdd8c35c1ae648df149a1d5c0df32604df553655
-DIST haproxy-2.8.12.tar.gz 4404583 BLAKE2B 
fb5f29d981f6a26f27357e46abe29f00703e2fe46ec36466efb26c3baf8c353c48ad212665d19914b64455b2cf74a13e2105c380a737a53d9beb1ed79c1c75ab
 SHA512 
b7c0e5aca9f93621a518cab971a570f1d5da9dbdc07788146de99032e329dac06376cee2837f40ec88319e67c067cb9eaa1a6d66d28df63e7c253892115573e0
 DIST haproxy-2.8.13.tar.gz 4407964 BLAKE2B 
b9dc167ca395d71cf1340bd92c1399187f93fce0cfd2f895f6fda05f09bc341c63bc64fa8d4fed5cb521ff5466d8c9b09d368139ac09e11b43f58bb4dadbd138
 SHA512 
6097516d469ac633e2cdb1423d060b46708592d366a6a8d17bfc14a2224c40203cc201b905c3501aa3acc3c17edf6a25a812f88b599359507ee2a72136ee1b97
 DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B 
ae145fe6b642f860af814c2c43e84452a0bbc1b545b1b11eb07c65d903b97e42576b94e1774838b32b29ce32778941b79222669fc7615779c49f2ced85bf3fdc
 SHA512 
dd2fe2ccd5d8805da3f7544451507b182377c34a9951747643c04cb9ee178b7be0978d56a0586c59771c2bb955765d3e961f6f06187afb768dc1fd27f08da464
 DIST haproxy-2.9.11.tar.gz 4540689 BLAKE2B 
53f81c845e2bb8b3c9935a6035cb28d49708337e16081c2197cab60e4c1f01642cc64f1b2162bdabef07ab79cf72af9fac136bfa19fe89518b7de110433a1789
 SHA512 
316ab1dfbc60da4fe39acd4f9dc62d352690b35f0787f4fc0ae51853c7d35c656417e97945650bd79900d815414ad9504e4ff368e852657690f20ddc69bd3693
-DIST haproxy-2.9.12.tar.gz 4551877 BLAKE2B 
884df1c1cff3abfe96f92b9756f5ec6662c8f90059958bc600bc4bb8f9f96568cc6c7d97030fdb55b34414f0ab901067ee002c77ae57b2b940e9ef3feb17b9a1
 SHA512 
ad5dadae9bbb2e1e7547e500ec02b44bc7e97c4a133e5fddfc9213bc39c4696437ffdc1b60a95505222f1aa4830d95196fd723673836a2704434ae70a5acd067
 DIST haproxy-2.9.13.tar.gz 4555979 BLAKE2B 
8ef464cf9f6c12f7a85336f578137e4a070e9f0083a4cf99150b7a4128211afbf92bfd578debc77657533c0188cb41fbcc08c6e575abb9feefd0980f0792163e
 SHA512 
7ad13194ae274123d4bfbdaa00d4dcd662218bc98274c11adffb9334d9215dec71d7f97491e5042c5134a472207563292d9a87e9ec58e33f7a0c346b757ab52a
 DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 
5666624d340cba70bc21f53efbe0a7b37897a616e55aa865ffa80471b6b5c03b3eae10bf86078245ec87cc2681b1fd2777148e0fa7f0d4a0a6bc65733f0e8692
 SHA512 
4e00069356083c8d428bf056e2a26ccfb3e18029cc96769189010d59d0b4f1c7af58986f1653067db83838dcbc2c138798663d3fbb9aac1d3c49c30cfc579c2a
 DIST haproxy-3.0.5.tar.gz 4698022 BLAKE2B 
c64d8799755fddaf5b45a9e2b67c5f03b25af98fbddde68ab1206c288d9a65f91938810b150c4398ee138d9154c90f1af9fb05c3d0bbc80394e71430e1cc4396
 SHA512 
8c16b026d5e26fc030178ecd354c68e8ea32c2b971f143cb2aa2f1b2d16fbfc0a27e3975f78873a0cefe3f904b5f1999f8d75622a04234b9cf88f90161d9ea91
-DIST haproxy-3.0.6.tar.gz 4710169 BLAKE2B 
51d459756523b073c43ef052a76fe331aba08dc2877cdbe2a97a7025874cbd795220ca133978e5ff4f9f2536c7a47e2f7458a27ef6786af9b626ec550fc95c5a
 SHA512 
a072ad27fc7478d6082b2f92ce869a8d31d80b9d0cca70e9d256c53e54615accdb34d680fe092e72d534647ab3c82394537f55f74e3e7561419eb2c4e249daf9
 DIST haproxy-3.0.7.tar.gz 4713776 BLAKE2B 
f6515e0d6e3d26a122e341715ecdcc701c6b98fb5ba2d2bf9d38d65cd6d00fc43912c223b0b1530c1154b326247362ea7b1253af5e0ba9567937fb51aa6cc0f6
 SHA512 
a2ee8cf513fcbae9fc6fa8d66dc6dcd5013667791ef9c3320753f4490904e1568258e499a3b2ccdd3b9d60b2efce98688fd638297cd9b87bddb715167c730c70
-DIST haproxy-3.1.0.tar.gz 4892185 BLAKE2B 
32f2fc10b8168289d01f6879443a996d58d2d55e3bca6788f5776637bc97b18f6f45ae76ff5815fec0a77f334cfafc8cc2a0f43e01eb5bd4066260ef16236580
 SHA512 
b3006dc90d51b44589371ab107eeb8abd04d65f015163569fd602035dee4bc95a516e5fbf786e9f42a6744134cbf4b9478399277f6fa501429b1a9c4044a07b6
-DIST haproxy-3.1.1.tar.gz 4897704 BLAKE2B 
fb79c335997792441fd697595bc784d462648bb67b260d05db9786a97b480d76927e94e7b54a3064cf3f4ab4c2ed27c2c1ec6b72a4df0c1ac6604299ee7c5d94
 SHA512 
a2f72fd5bbd8e2a0f93c5b7ad34c77b9eecd1ec0de566985693e3c3a4dc670a2b6fb9972a4b59e29ab31dcc0f297fc710338d51652ef26caf0a5630b32b0e17e
+DIST haproxy-3.1.2.tar.gz 4899606 BLAKE2B 
234a365251f226dcd1892fe89ec0dc11f505a85e08b12be1dba61dfd03808cb4cd8ad0f0548b2250379ade124314a5b5577b634bb401798666bae41fe1cc1388
 SHA512 
5fe0717cab829943438466d0d1e7afddca5dd68e0458fba33584c0e938d117401c3a60bf1d595717d4f7103aba0379ff498148abd205bf515b7b192e11bd73bf

diff --git a/net-proxy/haproxy/haproxy-2.8.12.ebuild 
b/net-proxy/haproxy/haproxy-2.8.12.ebuild
deleted file mode 100644
index ce11ece1a066..000000000000
--- a/net-proxy/haproxy/haproxy-2.8.12.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-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
-       # This is arbitrary; upstream uses master.  Try to update when possible
-       VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-       VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-       SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz
-                       test? ( 
https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> 
VTest-${VTEST_COMMIT}.tar.gz )"
-       KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-       VTEST_DIR="${WORKDIR}/VTest"
-       EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/";
-       EGIT_BRANCH=master
-else
-       VTEST_DIR="${WORKDIR}/VTest"
-       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 test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-       lua? ( ${LUA_REQUIRED_USE} )
-       ?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-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} )
-       test? (
-               dev-libs/libpcre2
-               sys-libs/zlib
-       )"
-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_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               default
-       else
-               git-r3_src_unpack
-               EGIT_REPO_URI="https://github.com/vtest/VTest"; 
EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-       fi
-}
-
-src_compile() {
-       local -a args=(
-               V=1
-               # Switching to PCRE2 by default, bug 838013
-               PCRE=
-               PCRE_JIT=
-       )
-
-       if use elibc_musl; then
-               args+=( TARGET=linux-musl )
-       else
-               args+=( TARGET=linux-glibc )
-       fi
-
-       # 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_test() {
-       # https://github.com/vtest/VTest/issues/12
-       emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} 
-Wno-error=unused-result"
-       ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 
for tests"
-       env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j 
"$(makeopts_jobs)" \
-               HAPROXY_PROGRAM="${S}/haproxy" 
VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
-       dosbin 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
-
-       insinto /usr/share/vim/vimfiles/syntax
-       doins admin/syntax-highlight/haproxy.vim
-}
-
-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.9.12.ebuild 
b/net-proxy/haproxy/haproxy-2.9.12.ebuild
deleted file mode 100644
index ce11ece1a066..000000000000
--- a/net-proxy/haproxy/haproxy-2.9.12.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-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
-       # This is arbitrary; upstream uses master.  Try to update when possible
-       VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-       VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-       SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz
-                       test? ( 
https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> 
VTest-${VTEST_COMMIT}.tar.gz )"
-       KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-       VTEST_DIR="${WORKDIR}/VTest"
-       EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/";
-       EGIT_BRANCH=master
-else
-       VTEST_DIR="${WORKDIR}/VTest"
-       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 test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-       lua? ( ${LUA_REQUIRED_USE} )
-       ?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-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} )
-       test? (
-               dev-libs/libpcre2
-               sys-libs/zlib
-       )"
-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_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               default
-       else
-               git-r3_src_unpack
-               EGIT_REPO_URI="https://github.com/vtest/VTest"; 
EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-       fi
-}
-
-src_compile() {
-       local -a args=(
-               V=1
-               # Switching to PCRE2 by default, bug 838013
-               PCRE=
-               PCRE_JIT=
-       )
-
-       if use elibc_musl; then
-               args+=( TARGET=linux-musl )
-       else
-               args+=( TARGET=linux-glibc )
-       fi
-
-       # 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_test() {
-       # https://github.com/vtest/VTest/issues/12
-       emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} 
-Wno-error=unused-result"
-       ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 
for tests"
-       env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j 
"$(makeopts_jobs)" \
-               HAPROXY_PROGRAM="${S}/haproxy" 
VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
-       dosbin 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
-
-       insinto /usr/share/vim/vimfiles/syntax
-       doins admin/syntax-highlight/haproxy.vim
-}
-
-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-3.0.6.ebuild 
b/net-proxy/haproxy/haproxy-3.0.6.ebuild
deleted file mode 100644
index 019b7ed1219f..000000000000
--- a/net-proxy/haproxy/haproxy-3.0.6.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-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
-       # This is arbitrary; upstream uses master.  Try to update when possible
-       VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-       VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-       SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz
-                       test? ( 
https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> 
VTest-${VTEST_COMMIT}.tar.gz )"
-       KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-       VTEST_DIR="${WORKDIR}/VTest"
-       EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/";
-       EGIT_BRANCH=master
-else
-       VTEST_DIR="${WORKDIR}/VTest"
-       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 test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-       lua? ( ${LUA_REQUIRED_USE} )
-       ?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-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} )
-       test? (
-               dev-libs/libpcre2
-               sys-libs/zlib
-       )"
-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_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               default
-       else
-               git-r3_src_unpack
-               EGIT_REPO_URI="https://github.com/vtest/VTest"; 
EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-       fi
-}
-
-src_compile() {
-       local -a args=(
-               V=1
-               # Switching to PCRE2 by default, bug 838013
-               PCRE=
-               PCRE_JIT=
-       )
-
-       if use elibc_musl; then
-               args+=( TARGET=linux-musl )
-       else
-               args+=( TARGET=linux-glibc )
-       fi
-
-       # 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
-
-       emake CFLAGS="${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}" 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}" 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}" 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_test() {
-       # https://github.com/vtest/VTest/issues/12
-       emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} 
-Wno-error=unused-result"
-       ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 
for tests"
-       env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j 
"$(makeopts_jobs)" \
-               HAPROXY_PROGRAM="${S}/haproxy" 
VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
-       dosbin 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
-
-       insinto /usr/share/vim/vimfiles/syntax
-       doins admin/syntax-highlight/haproxy.vim
-}
-
-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-3.1.1.ebuild 
b/net-proxy/haproxy/haproxy-3.1.1.ebuild
deleted file mode 100644
index c0bde0ca349c..000000000000
--- a/net-proxy/haproxy/haproxy-3.1.1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-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
-       # This is arbitrary; upstream uses master.  Try to update when possible
-       VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
-       VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
-       SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz
-                       test? ( 
https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> 
VTest-${VTEST_COMMIT}.tar.gz )"
-       KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-       VTEST_DIR="${WORKDIR}/VTest"
-       EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/";
-       EGIT_BRANCH=master
-else
-       VTEST_DIR="${WORKDIR}/VTest"
-       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 test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-       lua? ( ${LUA_REQUIRED_USE} )
-       ?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-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} )
-       test? (
-               dev-libs/libpcre2
-               sys-libs/zlib
-       )"
-RDEPEND="${DEPEND}
-       acct-group/haproxy
-       acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS )
-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_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               default
-       else
-               git-r3_src_unpack
-               EGIT_REPO_URI="https://github.com/vtest/VTest"; 
EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
-       fi
-}
-
-src_compile() {
-       local -a args=(
-               V=1
-               # Switching to PCRE2 by default, bug 838013
-               PCRE=
-               PCRE_JIT=
-       )
-
-       if use elibc_musl; then
-               args+=( TARGET=linux-musl )
-       else
-               args+=( TARGET=linux-glibc )
-       fi
-
-       # 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 prometheus-exporter PROMEX) )
-
-       # Bug #668002
-       if use ppc || use arm || use hppa; then
-               TARGET_LDFLAGS=-latomic
-       fi
-
-       emake CFLAGS="${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}" 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}" 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}" 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_test() {
-       # https://github.com/vtest/VTest/issues/12
-       emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} 
-Wno-error=unused-result"
-       ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 
for tests"
-       env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j 
"$(makeopts_jobs)" \
-               HAPROXY_PROGRAM="${S}/haproxy" 
VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
-       dosbin 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
-
-       insinto /usr/share/vim/vimfiles/syntax
-       doins admin/syntax-highlight/haproxy.vim
-}
-
-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-3.1.0.ebuild 
b/net-proxy/haproxy/haproxy-3.1.2.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-3.1.0.ebuild
rename to net-proxy/haproxy/haproxy-3.1.2.ebuild
index c0bde0ca349c..d7bd5ede499e 100644
--- a/net-proxy/haproxy/haproxy-3.1.0.ebuild
+++ b/net-proxy/haproxy/haproxy-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"


Reply via email to