commit:     f43496ca829b0ee834715c4610cbc319b258be18
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 07:18:12 2021 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 07:18:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f43496ca

net-proxy/haproxy: Cleanups and version bump to 2.2.13

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>

 net-proxy/haproxy/Manifest                         |   7 +-
 net-proxy/haproxy/haproxy-1.8.28.ebuild            | 170 -------------------
 net-proxy/haproxy/haproxy-2.1.4-r2.ebuild          | 181 ---------------------
 net-proxy/haproxy/haproxy-2.1.9999.ebuild          | 181 ---------------------
 net-proxy/haproxy/haproxy-2.2.11.ebuild            | 181 ---------------------
 ...haproxy-2.1.12.ebuild => haproxy-2.2.13.ebuild} |   0
 net-proxy/haproxy/haproxy-2.3.7.ebuild             | 178 --------------------
 net-proxy/haproxy/haproxy-2.3.8.ebuild             | 178 --------------------
 8 files changed, 1 insertion(+), 1075 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 8d7661b2c12..d6b162ba7b0 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,12 +1,7 @@
-DIST haproxy-1.8.28.tar.gz 2211162 BLAKE2B 
81123750285a34891248fad675511c372aa87ff5047b2d7d8635984a7a71183ee2b3fce78c42a999424b70b1ee5d8a26b46bbe9dec1e951ed1845332bc566109
 SHA512 
67e7ff9bb5cba7b2ca2274a9fe72397d9a9c85257acdb963f20988db3760c0cd2deba09022b95df18d8a90601c55bd83fe7282fc0a124c796c54714788a39794
 DIST haproxy-1.8.29.tar.gz 2213262 BLAKE2B 
e63a437fce005f08615bc87937a7a38f404845f1d73fe1b06881c26ee7ab2577af2a409cbbd4df89b54274589780c13e1b750f37deaa31d27dd866d36464e767
 SHA512 
dbdb0c47d94cc332cb7a20558ee50b6e96781295af36f4e342799db8f9254f8a4b4f11d91004405aca4ece6d3d43b66d93f8a979238507e3db7a7c37af1573d3
 DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B 
dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0
 SHA512 
6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993
 DIST haproxy-2.0.21.tar.gz 2696549 BLAKE2B 
97f211a768006370d85c0b2bda539440ac26051d445d3430a8fbaa135692165fb3ce32e998fcf54e669d9a2e08a23526a769b841fdd36b69d484ec86812d0a6c
 SHA512 
a2273928568ca27d164a9bfae579a4635afa57f8d52f576073758d26a60973bb713a49fbafa6173e3130ca5712efdbf4e214bf85b7530b23eb523b667848f588
-DIST haproxy-2.1.12.tar.gz 2731180 BLAKE2B 
fe1d586c5f6a7844606d4b8cd8cb810464f0d7d5615d53e7d53e8d45eb383021952e419e2f00a9277dd9b92d2c62dad60db9dd7ea9a87e21a04c960287c05cba
 SHA512 
e33735311b0c7f349d5f6aa88fd69e1e9838c08fdf793f6e0d27779cd0c165d9a85022c778be880a8284f62c3c511c2b2d16374bf466268c902045631a4fbff1
-DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 
0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4
 SHA512 
fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98
-DIST haproxy-2.2.11.tar.gz 2907128 BLAKE2B 
76ce4d75e6be1b3e169fe1f2a3ca4dc104f7b0a7af308e1713ce7c235e45525d094bcff71853de9d78e9b6d32115b96616d3d86fb72397d8fdf7d70f375f2547
 SHA512 
bf05666a712710a1b99e6014a97aceb0a3e9a3184afdaaf2ae4454e8f444f6b85fd855c41c211882e8158d5939f81f1da2dc8468a6a778914e6caa4a9246a5d3
 DIST haproxy-2.2.12.tar.gz 2913160 BLAKE2B 
0a9bc637e2d70a23ca33f3711569c0a3dbd0922f332cffc024ba523271bf8086871595a9cd9636d2ce71811f6f8c8190d1d58179458f2cf1d64562f826392471
 SHA512 
fc4d8725d85aaecc8cacd9177a81dea1b09d5b000ff27bb5217847779e89d67cabd35db6175acc898b674dc1c5aadfa20b015d54095a5ea2f2176444c858d90d
+DIST haproxy-2.2.13.tar.gz 2921533 BLAKE2B 
870f105ab8dd6697944959b7422804b58379fb26540ecb6a396c016bdbd3f6ca44f20bcc67e6ce71a6a4b09104985dd4540c840cdf3045131bdaf9c5a56cba14
 SHA512 
33f0821b49e5916621d06cd524e25011072bfd0a9ed2db95a53c2d26f51ac484866fedbc54f2214b250f502297063926e6c5f6f4dee8aa77cde24098835c213d
 DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 
1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98
 SHA512 
74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca
-DIST haproxy-2.3.7.tar.gz 2924802 BLAKE2B 
c2f82a49e7422b36f5af5568790002f2e5761adb971f4692406b8573035245782b155f6f05cd388400476f1af3734284dccf9922ba8a04ee3497dbf03d926bab
 SHA512 
ba567294c61dbd19c178acace8804979fdb26384115e77a4eb88444fa9d45b1c62f22a171efafeeba027ae65f3a70fb67b7a3f84042eada025b6cce3b9ad62ec
-DIST haproxy-2.3.8.tar.gz 2928770 BLAKE2B 
198529d7b2ff359b9586b0e67a73682cad084276a009a99ce7fe798c2c62c3d1a6854f5c6c6d22f5969fb19443f5b1a6f33a3986ac9da1c11e10a1bb18948ae4
 SHA512 
edc211f9328af3ceb323b2f232585c08b3a592d53286b4b2af79797dc3036dbef25dceff93f3344cf8d02d3e6f235151777710d0e4c4368bb737e7171903c966
 DIST haproxy-2.3.9.tar.gz 2928660 BLAKE2B 
48b56aa72d50d4783bf54c6dbf642388d6f12d4e2ede09e86e9262d62a981177365dc2d2999e76c2be124c0576fe0b8d16a7a5bf412133fcbf87d45d8abfe3dd
 SHA512 
49ee2a9be8dc7836e73be8e01ccbde52e29522f94d0bc80cf753fe76f4b32657fb123df7d443228afef36928f5a6cef67b693f05008a891001082b4264f015f6

diff --git a/net-proxy/haproxy/haproxy-1.8.28.ebuild 
b/net-proxy/haproxy/haproxy-1.8.28.ebuild
deleted file mode 100644
index 861e6ae7a25..00000000000
--- a/net-proxy/haproxy/haproxy-1.8.28.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic 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 libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit 
ssl
-systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-       pcre2-jit? ( pcre2 )
-       pcre? ( !pcre2 )
-       device-atlas? ( pcre )
-       ?? ( slz zlib )"
-
-DEPEND="
-       pcre? (
-               dev-libs/libpcre
-               pcre-jit? ( dev-libs/libpcre[jit] )
-       )
-       pcre2? (
-               dev-libs/libpcre
-               pcre2-jit? ( dev-libs/libpcre2[jit] )
-       )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0=[zlib?] )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       slz? ( dev-libs/libslz:= )
-       systemd? ( sys-apps/systemd )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       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() {
-       if use net_ns; then
-               CONFIG_CHECK="~NET_NS"
-               linux-info_pkg_setup
-       fi
-}
-
-src_compile() {
-       local -a args=(
-               V=1
-               TARGET=linux2628
-               USE_GETADDRINFO=1
-               USE_TFO=1
-       )
-
-       # 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 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
-
-       emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-       emake -C contrib/systemd SBINDIR=/usr/sbin
-
-       if use tools ; then
-               for contrib in ${CONTRIBS[@]} ; do
-                       emake -C contrib/${contrib} \
-                               CFLAGS="${CFLAGS}" 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 examples/seamless_reload.txt
-       fi
-
-       if use vim-syntax ; then
-               insinto /usr/share/vim/vimfiles/syntax
-               doins examples/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.1.4-r2.ebuild 
b/net-proxy/haproxy/haproxy-2.1.4-r2.ebuild
deleted file mode 100644
index bffd36a3ab4..00000000000
--- a/net-proxy/haproxy/haproxy-2.1.4-r2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic 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 libressl 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 )
-       device-atlas? ( pcre )
-       ?? ( slz zlib )"
-
-DEPEND="
-       pcre? (
-               dev-libs/libpcre
-               pcre-jit? ( dev-libs/libpcre[jit] )
-       )
-       pcre2? (
-               dev-libs/libpcre
-               pcre2-jit? ( dev-libs/libpcre2[jit] )
-       )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0=[zlib?] )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       slz? ( dev-libs/libslz:= )
-       systemd? ( sys-apps/systemd )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       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() {
-       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.1.9999.ebuild 
b/net-proxy/haproxy/haproxy-2.1.9999.ebuild
deleted file mode 100644
index 94d32f6c96a..00000000000
--- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic 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 libressl 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 )
-       device-atlas? ( pcre )
-       ?? ( slz zlib )"
-
-DEPEND="
-       pcre? (
-               dev-libs/libpcre
-               pcre-jit? ( dev-libs/libpcre[jit] )
-       )
-       pcre2? (
-               dev-libs/libpcre
-               pcre2-jit? ( dev-libs/libpcre2[jit] )
-       )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0=[zlib?] )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       slz? ( dev-libs/libslz:= )
-       systemd? ( sys-apps/systemd )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       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() {
-       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.11.ebuild 
b/net-proxy/haproxy/haproxy-2.2.11.ebuild
deleted file mode 100644
index 94d32f6c96a..00000000000
--- a/net-proxy/haproxy/haproxy-2.2.11.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic 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 libressl 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 )
-       device-atlas? ( pcre )
-       ?? ( slz zlib )"
-
-DEPEND="
-       pcre? (
-               dev-libs/libpcre
-               pcre-jit? ( dev-libs/libpcre[jit] )
-       )
-       pcre2? (
-               dev-libs/libpcre
-               pcre2-jit? ( dev-libs/libpcre2[jit] )
-       )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0=[zlib?] )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       slz? ( dev-libs/libslz:= )
-       systemd? ( sys-apps/systemd )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       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() {
-       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.1.12.ebuild 
b/net-proxy/haproxy/haproxy-2.2.13.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-2.1.12.ebuild
rename to net-proxy/haproxy/haproxy-2.2.13.ebuild

diff --git a/net-proxy/haproxy/haproxy-2.3.7.ebuild 
b/net-proxy/haproxy/haproxy-2.3.7.ebuild
deleted file mode 100644
index 463b8b547e6..00000000000
--- a/net-proxy/haproxy/haproxy-2.3.7.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic 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 libressl 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 )
-       device-atlas? ( pcre )
-       ?? ( slz zlib )"
-
-DEPEND="
-       pcre? (
-               dev-libs/libpcre
-               pcre-jit? ( dev-libs/libpcre[jit] )
-       )
-       pcre2? (
-               dev-libs/libpcre
-               pcre2-jit? ( dev-libs/libpcre2[jit] )
-       )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0=[zlib?] )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       slz? ( dev-libs/libslz:= )
-       systemd? ( sys-apps/systemd )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       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() {
-       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) )
-
-       # 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.3.8.ebuild 
b/net-proxy/haproxy/haproxy-2.3.8.ebuild
deleted file mode 100644
index 463b8b547e6..00000000000
--- a/net-proxy/haproxy/haproxy-2.3.8.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic 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 libressl 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 )
-       device-atlas? ( pcre )
-       ?? ( slz zlib )"
-
-DEPEND="
-       pcre? (
-               dev-libs/libpcre
-               pcre-jit? ( dev-libs/libpcre[jit] )
-       )
-       pcre2? (
-               dev-libs/libpcre
-               pcre2-jit? ( dev-libs/libpcre2[jit] )
-       )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0=[zlib?] )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       slz? ( dev-libs/libslz:= )
-       systemd? ( sys-apps/systemd )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       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() {
-       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) )
-
-       # 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
-}

Reply via email to