commit:     81dcee6c66d746b40e715815ded1346aaa84d8f4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 21:45:09 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 19:52:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81dcee6c

net-proxy/haproxy: drop old

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-proxy/haproxy/Manifest                 |   8 --
 net-proxy/haproxy/haproxy-1.8.26.ebuild    | 169 ---------------------------
 net-proxy/haproxy/haproxy-2.0.14-r1.ebuild |   2 +-
 net-proxy/haproxy/haproxy-2.0.14.ebuild    | 176 ----------------------------
 net-proxy/haproxy/haproxy-2.0.17.ebuild    | 180 -----------------------------
 net-proxy/haproxy/haproxy-2.0.18.ebuild    | 180 -----------------------------
 net-proxy/haproxy/haproxy-2.1.4-r1.ebuild  |   2 +-
 net-proxy/haproxy/haproxy-2.1.4.ebuild     | 176 ----------------------------
 net-proxy/haproxy/haproxy-2.1.8.ebuild     | 180 -----------------------------
 net-proxy/haproxy/haproxy-2.1.9.ebuild     | 180 -----------------------------
 net-proxy/haproxy/haproxy-2.2.0.ebuild     | 180 -----------------------------
 net-proxy/haproxy/haproxy-2.2.3.ebuild     | 180 -----------------------------
 net-proxy/haproxy/haproxy-2.2.4.ebuild     | 180 -----------------------------
 13 files changed, 2 insertions(+), 1791 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index d0e81d1e3ce..4c981b67d3f 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,16 +1,8 @@
-DIST haproxy-1.8.26.tar.gz 2205531 BLAKE2B 
87aaeb3df6668752ec9242bda86b9b28339ad6926ee3ad16c606239693daa0d957271a76e270bf7d2d64102024121d4e9c1458da0f2e1d9bb8188856c0f68949
 SHA512 
a88f1fab0c234140e949ca12a87a09d7be1e0888bf2022a19c971727af08e579e3e6318d87411772915df6d73880710e6afdab842b622b6c0fa02020fa5c9425
 DIST haproxy-1.8.27.tar.gz 2209243 BLAKE2B 
31d83f41fd5e8f77ec28a7c168661c7e8a24b51890cbc8336fd45668b031fca87a3533c9f78ee18302394e54e58b89786300a32506dadf0d7275c84e62b0f395
 SHA512 
d8b36787ea75cb3a8332b1b95fc154d6e83a52ffd91548d1d0bacab62a069d3c05e859e2e40ddb65c1a37d0a30cc6a29a07c8260ce69413a3e80c83b4143dd8a
 DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B 
dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0
 SHA512 
6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993
-DIST haproxy-2.0.17.tar.gz 2676783 BLAKE2B 
ee17afdf3b34bc28fe810746709ef5cb07cbcc3d7508ab13349f67b59584dfd53d6f2f926615b87095b6f130560a529c480957d62e2943bc0936e1b905896fa9
 SHA512 
edcd061534ef9a6d7eab9692dccbb22fb7a3bf145cbf555646763c0fd72f7f13d41482744072286327a48951397a11822f1708b26be24b7bc5a327f516ca8816
-DIST haproxy-2.0.18.tar.gz 2679168 BLAKE2B 
dbc591223f640524bc898b5c2261c4092ddee0b245fcf96ea0ccccab45fdbdadb2880b870ced6141b6325ad5bb7765951d15b0325d3343bea7e90a138db0c68b
 SHA512 
67245c375541b6004667831aaecb38e59429363f45f24fd0c4c36a28fa59dc24d66fe54b093e6b52d6029b6de8b3c86cda19e15f5f438119669bca9d70d4c0a3
 DIST haproxy-2.0.19.tar.gz 2682426 BLAKE2B 
6e14842bfcc23167414e2f4e222708bc2d08947b0c420b758b5eaf35a5145c1d013b376a2e84df77802277fe8cc2fd5a14ed9cab3232a74590ec76813fa06952
 SHA512 
6484c14e7296f4600a1b7a2123809097cac563767dc79c1cbcd29d5fc0e580926b4701d3d095fe146c1de334e5ec50502d2f97fcdd0b711889711e806720fa2f
 DIST haproxy-2.1.10.tar.gz 2721955 BLAKE2B 
b7fb27aac039cc52a35afc2710c83200727fb8fad570980ed92e68ec4e0be002d4c0e792ce2636b6470a81cd5b6c1e80be9ea53490034d67a173522801cd7315
 SHA512 
923db1b5374e5026304f593d939e905c72a9850dd7199f655ec250ce9e81bf8b712895d7eafaf5f248885d138b31d3dda679fb92bd8a9536ed681f2a09acded6
 DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 
0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4
 SHA512 
fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98
-DIST haproxy-2.1.8.tar.gz 2715203 BLAKE2B 
fdf0896c8ee7a10268f422058f5a75c2b245da1bffed765dc618f24d18c95704724022f229b82e8df0cf2220dd3b9aa295825a7a6087009123841bead071974f
 SHA512 
6aaf1822e88189344dadc0ab64ccba3268a913a8676a375039cbe5447d5f54957668b23f1314bf68f97c195400f5817a08dd898318368075f73c1a2cca366a78
-DIST haproxy-2.1.9.tar.gz 2720185 BLAKE2B 
bdc93093f0bd7b7652376dfb65f5ea373c6420e53c0180ee07c644fe26bcf3c4fb2724624ce5f68504ca89b9c82f52de47a7da42e88e7ee3dc72b9780fab9d69
 SHA512 
acd0a4f49f67ceba4474223fab098b3f65897f9863bc91bc84af3f78945ad925cf12b2a261ccc4839f0b059557537899879a3929f05c6bb42b025bdb444f345a
-DIST haproxy-2.2.0.tar.gz 2866916 BLAKE2B 
176234efefee72beb1b46e7e8bb2455edc4135323b834a73870e30ca7a439b24cbb62568cb2aacd9d6b4d5c2234ebe7524de119a3ac2ec1c1f701de03a174933
 SHA512 
25cff09acba29ba36f045d45f894d26a13eea3e71c3e1f868446e739eed1fcfee8fc4af8da2914eef7ecbfe266a498f931cc6ec6c3e73b8874c140618269f480
-DIST haproxy-2.2.3.tar.gz 2872195 BLAKE2B 
266375aeca17ea0053956d3fd8a4077da70e308501042b67433722f0ed2efbc85438d8cd7a6d7c7a3184349ff6cf6ed5ae90d05a150b6fda1077400f0769d75a
 SHA512 
db99a5069537b6a3f161ad0a32ed884e81e27ed471d7c5f74b0655580c3eb1248376c5b252a9b998bead4fc5c05f28fda9e2280b8b05447bc5bc2d3c8fb55825
-DIST haproxy-2.2.4.tar.gz 2874180 BLAKE2B 
c53da911f09a5b35ae97709691754aceed09b01dffa27ee69368d26f552c1b87d149477ad8ab0410564e5ef1d520c91e069b36a9f3a5588a8cf9feb3139f9181
 SHA512 
762b51fdb9609654155ea2feebeb640bdd817481f633f012d767e1481bf888b90790455f0305ea9bbd0aec8363561d183bd510029f1bcce95102328ffbaf8afd
 DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 
1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98
 SHA512 
74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca
 DIST haproxy-2.2.6.tar.gz 2890554 BLAKE2B 
c1a8f2611f373a80d3a246e5daac9ce7f69cbb7c7104057e9afbcb83b373ed97a5ae8d35d0152f4739b112693b312cd3535ef9b3c6c22b3e92f5ec6fbd5321ae
 SHA512 
b9afa4a4112dccaf192fce07b1cdbb1547060d998801595147a41674042741b62852f65a65aa9b2d033db8808697fd3a522494097710a19071fbb0c604544de5
 DIST haproxy-2.3.2.tar.gz 2903983 BLAKE2B 
f4acc499e9210f1f520d1cc0913511986c1ecc74d5b9cc492e398cbeb29824d28c6983646d21a6c1eaf1f04010815778e582d1de464d39cd2660c63d5aa2b043
 SHA512 
ffabf499781220f71fd99d7f66f3a77f310ef69735e5c7e714f976052122788c917593d5e665d3a60d687a3ff63579331fdc5816414a8b75c7c8573e0b286ed5

diff --git a/net-proxy/haproxy/haproxy-1.8.26.ebuild 
b/net-proxy/haproxy/haproxy-1.8.26.ebuild
deleted file mode 100644
index 2c5c63d0d07..00000000000
--- a/net-proxy/haproxy/haproxy-1.8.26.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 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"
-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:= )
-       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.0.14-r1.ebuild 
b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
index dbcd0d12bd9..17aa93cde06 100644
--- a/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+       KEYWORDS="amd64 arm ~ppc x86"
 else
        EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
        EGIT_BRANCH=master

diff --git a/net-proxy/haproxy/haproxy-2.0.14.ebuild 
b/net-proxy/haproxy/haproxy-2.0.14.ebuild
deleted file mode 100644
index 4dd1e0979a3..00000000000
--- a/net-proxy/haproxy/haproxy-2.0.14.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user 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"
-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:= )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-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() {
-       enewgroup haproxy
-       enewuser haproxy -1 -1 -1 haproxy
-
-       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
-
-       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}" ${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.0.17.ebuild 
b/net-proxy/haproxy/haproxy-2.0.17.ebuild
deleted file mode 100644
index d1c45681b56..00000000000
--- a/net-proxy/haproxy/haproxy-2.0.17.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 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"
-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:= )
-       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.0.18.ebuild 
b/net-proxy/haproxy/haproxy-2.0.18.ebuild
deleted file mode 100644
index d1c45681b56..00000000000
--- a/net-proxy/haproxy/haproxy-2.0.18.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 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"
-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:= )
-       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.4-r1.ebuild 
b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
index dbcd0d12bd9..17aa93cde06 100644
--- a/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+       KEYWORDS="amd64 arm ~ppc x86"
 else
        EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
        EGIT_BRANCH=master

diff --git a/net-proxy/haproxy/haproxy-2.1.4.ebuild 
b/net-proxy/haproxy/haproxy-2.1.4.ebuild
deleted file mode 100644
index 4dd1e0979a3..00000000000
--- a/net-proxy/haproxy/haproxy-2.1.4.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user 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"
-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:= )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-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() {
-       enewgroup haproxy
-       enewuser haproxy -1 -1 -1 haproxy
-
-       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
-
-       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}" ${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.8.ebuild 
b/net-proxy/haproxy/haproxy-2.1.8.ebuild
deleted file mode 100644
index d1c45681b56..00000000000
--- a/net-proxy/haproxy/haproxy-2.1.8.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 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"
-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:= )
-       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.9.ebuild 
b/net-proxy/haproxy/haproxy-2.1.9.ebuild
deleted file mode 100644
index d1c45681b56..00000000000
--- a/net-proxy/haproxy/haproxy-2.1.9.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 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"
-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:= )
-       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.0.ebuild 
b/net-proxy/haproxy/haproxy-2.2.0.ebuild
deleted file mode 100644
index d1c45681b56..00000000000
--- a/net-proxy/haproxy/haproxy-2.2.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 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"
-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:= )
-       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.3.ebuild 
b/net-proxy/haproxy/haproxy-2.2.3.ebuild
deleted file mode 100644
index d1c45681b56..00000000000
--- a/net-proxy/haproxy/haproxy-2.2.3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 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"
-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:= )
-       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.4.ebuild 
b/net-proxy/haproxy/haproxy-2.2.4.ebuild
deleted file mode 100644
index d1c45681b56..00000000000
--- a/net-proxy/haproxy/haproxy-2.2.4.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 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"
-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:= )
-       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
-}

Reply via email to