gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /net-proxy
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
38 files changed, 282 insertions, 821 deletions
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 46f612ac22e3..985b97b5598e 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/adzapper/Manifest b/net-proxy/adzapper/Manifest
index 3fd26de5e6d3..e6b518c2725d 100644
--- a/net-proxy/adzapper/Manifest
+++ b/net-proxy/adzapper/Manifest
@@ -1,4 +1,4 @@
 AUX 20110915-flush.patch 2376 BLAKE2B c277dc6adb3d0e11ddf6ed5d723f822b63e93c5cc909ec1ec5b4ab7ead409acc9ef36b222e2f350434f200600878874fffa1ade53b1a70dfec5fa274a7854b0e SHA512 a15464953d0e589b4e679116a734e9d590990ce619858b8b8d9faac18a991c13b650c3f1edc732dbc4e8c2d38e82f67700471421b3a7250fdec4e6461f58d2ca
 DIST adzap-20110915.tar.gz 128132 BLAKE2B 4395c6270c7a4581505a1bd27550d1311e6bca9e1ac25cc1b029b695845f9ce586deb306f5122b6125095fe157251dd0482c1cc666bd37063f665fd6954765f8 SHA512 8b3566fc708b3db3b8eaa0306f90c75a82ac001cfdc3bc925fc649481420532ddc017f1b5139fce36733d3a38b2a7a31b39872b522ba4f49c098177496d64416
-EBUILD adzapper-20110915-r2.ebuild 1448 BLAKE2B 91b3c6e30441e3288a6315e7fda8846cc5ef577bd2c638c4e885caa92b18e75d12851d7bc63632b92cdae88da3688aaeb42a790c21ad10f9484df861093fa5eb SHA512 b8e39e71896ab029c43eca8865b8996d686d4136ad54db38a128824dd6710b079b9a960cc13e12d8f1b3c4d6a367217ff87623312a8162e16f590d530ee4485f
+EBUILD adzapper-20110915-r2.ebuild 1439 BLAKE2B c341503d3c67cad39dc33bcb64b2217bbc6ff3801716539348f7d9e2496d46ff2f4caa060f93255260ebb1f9e31c05f6c37a6c51800c3e3e749b964e04dac257 SHA512 1226672ed257cdc18a01623d07fe197c3dc7d8eacf7b0aac13854ceec798a12528d549671ead81b55915a3b112d3c1903bb4bbbc2bc91c85f0000f9fca62bf78
 MISC metadata.xml 245 BLAKE2B 3042c1bbbe1474e9a8ede43957c1a6a247a0ec0723972e2e9800a508bdddc4c867c5d8e8fc18db9189dd21f43f97b769fea1e612f8adc7b028e7d5b1f48e9996 SHA512 9791990a73c78c55718416f66a5eeb7f22c5f0a378f18d9c19c76c4f729319dbe7406802d5a7f1540da5bae60dd1818025a86c0af98609e9ba0a01b9b6555c38
diff --git a/net-proxy/adzapper/adzapper-20110915-r2.ebuild b/net-proxy/adzapper/adzapper-20110915-r2.ebuild
index d972ca4552cc..89058d66e275 100644
--- a/net-proxy/adzapper/adzapper-20110915-r2.ebuild
+++ b/net-proxy/adzapper/adzapper-20110915-r2.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P=${P/zapper/zap}
 
-inherit eutils
-
 DESCRIPTION="Redirector for squid to intercept advertising, page counters and web bugs"
 HOMEPAGE="http://adzapper.sourceforge.net/"
 SRC_URI="http://adzapper.sourceforge.net/${MY_P}.tar.gz"
+S="${WORKDIR}"/${P/per/}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
-IUSE=""
 
 RDEPEND="dev-lang/perl"
 
-S="${WORKDIR}"/${P/per/}
+PATCHES=(
+	"${FILESDIR}"/20110915-flush.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/20110915-flush.patch
+	default
+
 	# update the zapper path in various scripts
 	local SCRPATH="/etc/adzapper/squid_redirect"
 	sed -i \
diff --git a/net-proxy/cntlm/Manifest b/net-proxy/cntlm/Manifest
index e33bca9a2401..17f58b006e7e 100644
--- a/net-proxy/cntlm/Manifest
+++ b/net-proxy/cntlm/Manifest
@@ -3,5 +3,5 @@ AUX cntlm.confd 150 BLAKE2B 8a421270797d3a248383b3c89b0cbd064b16d022dfbf3538ac92
 AUX cntlm.initd 480 BLAKE2B 9ff99a0189c04f7550fa201c7c1fb7d65e4b314c3230de0299e9a24ef82d9140d332a191b9b2b0d80a1e7d499d8aaf57de24d5d20ef25c5e478850f3b1e623dd SHA512 ceef9827bf8d3910d46daea09d3de9f111b7fb60ee2140abca5375fbcd62a0ee49838331b8ec9c292219bbc46b6ced0ed0bd869bf8fa1e2d31906b81eed6d43d
 AUX cntlm.service 207 BLAKE2B 1297446b05325a36e632b80743e67820db70c8ffb9db5119c19c63aabe48fb2cdc18a76a5a305627cdb85939661b0fe2e4a4920b4eb57239752f0173ed6b5b3c SHA512 5084b6e65b4b91120a8fe369f7cec1566103db04f1c25f9d13241e8051a49bc776bc68601992e02156719623f0f62e6e77f3781a40776601b19faa53e1039324
 DIST cntlm-0.93beta5.tar.gz 718018 BLAKE2B daaf75f42c63dd191dfe36bd326dad42d0b7f774749d2dc644d4009fdf6d9b22c863759ed6ad0425fe8bde31ed99fa358c04254f6e83d67d49c719d8e088a62b SHA512 5cb59788a0d6dc5cd787acb36dbe6de9a3909727d63327c9a12b20973619b777add9e0acbe94ed6a3cf1c189ef0e0ac6c01aa3c1c4739881bbd371b4c90744cd
-EBUILD cntlm-0.93_beta5-r2.ebuild 1070 BLAKE2B c466479f654da1ecbf5835ccd3dd07fc0dabca0b4276e939c9f865d6812d2d987e7452bbe910b11c2136db4699b36ead9900ddd0608bf4b9564e29ab038e7c26 SHA512 d16bfd29e3744962ebbb2d9f8b0e6b067cc00ba895532ae0098993df48bdc00bc82d4c9644605c3ffd0254cb01bb86db86219f12ea8b37abddc3a0a8dc9489c1
+EBUILD cntlm-0.93_beta5-r3.ebuild 985 BLAKE2B 6422fa020c1390d485c6cb51868d63fbcc8ddd3355c34fcfdce33253adaf063a00b1dbacda7da52e4369d49745922dca03203371cef47887adb8d808e95a3fc6 SHA512 688cc3c24e1dbf281dfca4abfb47e590fa9c63f3d6805480e991aeb06f5ceab56db13de49d1eab1d6bc94b265c9ff42174963fd93254e03dd845a1a12b95adc5
 MISC metadata.xml 242 BLAKE2B 8752cddbbc7973767fba3404814c85d49881b491b6e36e88efd733d5b7e5780a46f1117b6fff3181e0eb165c1cfeb7ad79bac21eba6f008fb8aabb04407cf860 SHA512 7e39b103b558c87cf3e0de64039989303f8488d1bbbe93ca53ee314016931c5a7ed88ae12fc492bc635de17e99e5c7c8d2258335fdf24d1366a6059c1528ae99
diff --git a/net-proxy/cntlm/cntlm-0.93_beta5-r2.ebuild b/net-proxy/cntlm/cntlm-0.93_beta5-r3.ebuild
index 2e86f2f75b59..4c6879ddacc1 100644
--- a/net-proxy/cntlm/cntlm-0.93_beta5-r2.ebuild
+++ b/net-proxy/cntlm/cntlm-0.93_beta5-r3.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils systemd toolchain-funcs user
+EAPI=7
+
+inherit systemd toolchain-funcs
 
 DESCRIPTION="Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy"
 HOMEPAGE="http://cntlm.sourceforge.net/"
 SRC_URI="http://ftp.awk.cz/pub/${P//_}.tar.gz"
+S="${WORKDIR}/${P//_}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${P//_}"
+RDEPEND="
+	acct-group/cntlm
+	acct-user/cntlm
+"
 
 src_prepare() {
-	eapply -p0 "${FILESDIR}"/${P}-buildsystem.patch # 334647
-
 	default
+	eapply -p0 "${FILESDIR}"/${P}-buildsystem.patch # 334647
 }
 
 src_configure() {
@@ -30,8 +30,7 @@ src_configure() {
 	econf
 
 	# Replace default config file path in Makefile
-	sed -i -e 's~SYSCONFDIR=/usr/local/etc~SYSCONFDIR=/etc~' \
-				"${S}"/Makefile || die "sed failed"
+	sed -e 's~SYSCONFDIR=/usr/local/etc~SYSCONFDIR=/etc~' -i "${S}"/Makefile || die
 }
 
 src_compile() {
@@ -49,8 +48,3 @@ src_install() {
 	insopts -m0600
 	doins doc/cntlm.conf
 }
-
-pkg_postinst() {
-	enewgroup cntlm
-	enewuser cntlm -1 -1 -1 cntlm
-}
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 37f6adbf52d2..d14672439b3a 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -12,5 +12,5 @@ AUX sockd.conf-with-libwrap.patch 870 BLAKE2B 8c56ab479f99f6dff61882c01842ef0780
 AUX sockd.conf-with-pam.patch 295 BLAKE2B f41c2109e21878d2b473c6cffb4fe845d59ac0478f5196f7ccdc42baafd674e0960169e3a9dbc4fedb4a27cb7df8bd0dfc255595a72c39185c7ffb177fb53da8 SHA512 78728605362360650e6a20869744fc941782b75d149c0835542faaad931104cb32dda56de77a7b4f9a4fa683053139c551bcf77607a047fb1be68b6da9388630
 AUX socks.conf 4185 BLAKE2B cb41b40e858c83d06bd5e199c4fc991e8dda0ee64d48fd94e52d6ef836e79d6a6f5f50b6dd55074e92b6f96f20db65922f53869f08506100ae8b59b722643cdd SHA512 d15ea77e20ad750f10285a42c9c6305cbed48313dea205139d8cf59fda4a4640bdd5c5bd2c295b32e0015b774d463f9ad34fa5a22fb188ae921dba1a533553eb
 DIST dante-1.4.1.tar.gz 1284288 BLAKE2B 34c78007245339088d79e0b969b8f55d20b0ee59d89c1bf19510b563799ac3c54c6b8b5f37bfb64410d60e893beb0e2d1d79893c0264b7481aeb4cdab2037e90 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e
-EBUILD dante-1.4.1-r2.ebuild 2685 BLAKE2B 04121f835399e9b46e13452ceb8283022f8718e0e0de62323812a4c0e31c96e82985b099543fc0c4d56418e784c7b9976c281f7d1089bd60ef1bb0b8e00d0034 SHA512 20fbbe8a291b336e4cee35ed66b3b503278b7864ca4fb62072599ba5a1c06bd492deae688eb0c5660f6bb3d914f3e19ddf811f3c50120ea03d72bdbd6856dff6
+EBUILD dante-1.4.1-r2.ebuild 2686 BLAKE2B 7245d4262f24cbff7d3f9aeefb7dcd6496a48dda4624cdb3d6a32cea497ad05add1ecbe5efb3525d0b8c77d2517510c6e1873a504c6307ddb3ac5ea6c8b9fc46 SHA512 50bc837c737e5a3421e3e3d25582a71e60310f9279d0e6f3a0a3b518b5d2507ca23c2cc554b3893f95f980eb8e1fea10aaa7621f646134857d2e3d0108e4407a
 MISC metadata.xml 212 BLAKE2B 3fa0112dac8ca387a2efccd5fcf038abfa26b67a2a512f3eb68491666f2ccb3fd63d1aa63044b0911aa6e5a8e856c762b3120045946afbf256611526d102558e SHA512 81dddbd7e6951957aa574cacaea6594ca44449251e028abd1a34e45e0b32dce1948c815478a65b4ed504364e4dd09f5a2c39d1f7019fc9b827a9ba28f52aca00
diff --git a/net-proxy/dante/dante-1.4.1-r2.ebuild b/net-proxy/dante/dante-1.4.1-r2.ebuild
index 040fefa416f3..268abe481b9b 100644
--- a/net-proxy/dante/dante-1.4.1-r2.ebuild
+++ b/net-proxy/dante/dante-1.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.inet.no/dante/files/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="debug kerberos pam selinux static-libs tcpd upnp"
 
 CDEPEND="
diff --git a/net-proxy/haproxy-dataplaneapi/Manifest b/net-proxy/haproxy-dataplaneapi/Manifest
index ff87502d08be..cf638c424ea5 100644
--- a/net-proxy/haproxy-dataplaneapi/Manifest
+++ b/net-proxy/haproxy-dataplaneapi/Manifest
@@ -371,5 +371,5 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
 DIST haproxy-dataplaneapi-2.2.0.tar.gz 423877 BLAKE2B 3ab769151da323ccf6d6418df81c0c61d2a01db7c9372508d59e006504a85747849d065191ad4ad81f0b3655c43983e609b284bdb56d656809696af1076d2d57 SHA512 5196329110c76c9895f0600de1461ed748912a1b4196995ff7d1c7fbc1fd919bc369729a783c5b3629ed3ad293b08a78bb3032d61de38b540d26d1468d1fc59a
-EBUILD haproxy-dataplaneapi-2.2.0.ebuild 19895 BLAKE2B b141cbd2ea0cd8cee6d843803e72effa198667c7760cec5b6a041610bd03ff71eab994b5499a55fdc42bbe1ab8b13747f95012f85d70c0a6a4789b90a2acc353 SHA512 c6a7fc269af0028bfb6eb85c2e9262167d50789f0d2199dcb8fd40c091732fbaf04c22f3f658cd0204530d8737c9770db6770b3bac94da735aaba8c5aa07dde7
+EBUILD haproxy-dataplaneapi-2.2.0.ebuild 19888 BLAKE2B ec23ef73577eb945c798df032b458cc1692e4b5f610c02a166c58108164fb3e09384bc0b6aa218595580cef418b23efcacd00c15d19810c2fddb3882a9991bf1 SHA512 b46ec6bb50bbc155307577fb09d84983c3ed6ba92e9e4c00cf1e9521a7c113a2185addf6351781799f375d4fe08a733760b351d9688cc2feb550a70cd62a8890
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.2.0.ebuild b/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.2.0.ebuild
index 148be26883f6..dd7ad029482e 100644
--- a/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.2.0.ebuild
+++ b/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.2.0.ebuild
@@ -394,7 +394,7 @@ IUSE=""
 S="${WORKDIR}/dataplaneapi-${PV}"
 
 src_compile() {
-	GOBIN="${S}/bin" emake build || die
+	GOBIN="${S}/bin" emake build
 }
 
 src_install() {
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index d9568b8a4b46..77cd19868f33 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,28 +1,25 @@
 AUX haproxy-2.3.0-hpack-VAR_ARRAY.patch 1230 BLAKE2B 282f82e498126771c3837f2da3cdb433db703ac9f6035d86de50a31d7f45f5d02c5704a30a4888b3b02e78d953acb31f29fedacc4c07b9521217dbfaeb2fd61d SHA512 a6ea15ac6b07c46695b9dc1aafadd7e3a74d413fbb31cf827fda202669a48c0108a20d303cd5a3e9c25bf7d75d588d011ba874eee3f90b5ba65498c861eca1b1
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
-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-1.8.30.tar.gz 2214184 BLAKE2B 07378b61c0b103fe3ff4c4ab936960d2f709cd20833ce2c343dece5496997f6819c68d0a58c6e11e4020b9a551328f9522b0ab739e7a0acd549eaa883bff7401 SHA512 13b0f80ad08c8d3ae41114b8112acd4f80f1f173f1a91a5f65439be86f341653be43ce9fe69168a934ccdb7a24abf476aef097b1f8fec5a0577f72ef19486d1f
 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.0.22.tar.gz 2698262 BLAKE2B 417bc6bdfad276d210d597896f0685637034593a2418b0fcf984e62b767a491000a1f62f58b5ccc8f552890de14607737bc81bdf4736b6e4212ac15081ef5689 SHA512 29a1ee6d77892003ab4d813336d1ea165d91784bcf2124b98ca030e376e7ccc1c1b9f09e9a85ef0cd04f9808b589bfc7b7c19f831dcb55bb41d7777a172112ff
+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
-EBUILD haproxy-1.8.28.ebuild 4821 BLAKE2B 1da71c014918e7b65a0ff50ee732da0a5f6894fb06a2819d3c3cc0bb885a54dd4a3b07f070092236c3a2b5faa3a864bd6dbc7256de22fd5c281efb4eca17a6bf SHA512 85a1a777244c54ca9d66475f6a34581a03749a7cc9ea904672a356c4aa3dc1f8f7bdb4b1e9c4e5b23663c8bbe7a918e4130519296f6188dabdf0b442e82e69e2
-EBUILD haproxy-1.8.29.ebuild 4821 BLAKE2B 1da71c014918e7b65a0ff50ee732da0a5f6894fb06a2819d3c3cc0bb885a54dd4a3b07f070092236c3a2b5faa3a864bd6dbc7256de22fd5c281efb4eca17a6bf SHA512 85a1a777244c54ca9d66475f6a34581a03749a7cc9ea904672a356c4aa3dc1f8f7bdb4b1e9c4e5b23663c8bbe7a918e4130519296f6188dabdf0b442e82e69e2
-EBUILD haproxy-2.0.14-r2.ebuild 5358 BLAKE2B feaf455162ba2bceb9ab6b2e93b23b4dc4edaa073ad4f2b16b6caac2693dce4947fdecf8ad3fca13d8fd1da85c449f0c32fb9b482a7b64d8e7af9480fbdac56f SHA512 15befeccd36f285b1a7c121c755eaa8707be230949d18e1c85eab07abaa3c997c9ea061dcc78f6a7f5994df76100ebfb94a732192bb923a1bf1b21a6c03e595e
-EBUILD haproxy-2.0.21.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
-EBUILD haproxy-2.0.9999.ebuild 5239 BLAKE2B 3e890c8af0d46e57e321b2942152ef13ff35a20f2b4250d1c1e7f7689d35c51c49d84b9fd3a95256ca0b1870577e40a500bee1b5d0a8f4676185b33a3a0f371e SHA512 5831d7d419c71d4ccf32a37be69d4409b35764c45684e4d795edc538c3c8fc029d63773f7ef64c93ac7f7b233d15b443186e656c12bc2daca8971c18d06693bd
-EBUILD haproxy-2.1.12.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
-EBUILD haproxy-2.1.4-r2.ebuild 5358 BLAKE2B feaf455162ba2bceb9ab6b2e93b23b4dc4edaa073ad4f2b16b6caac2693dce4947fdecf8ad3fca13d8fd1da85c449f0c32fb9b482a7b64d8e7af9480fbdac56f SHA512 15befeccd36f285b1a7c121c755eaa8707be230949d18e1c85eab07abaa3c997c9ea061dcc78f6a7f5994df76100ebfb94a732192bb923a1bf1b21a6c03e595e
-EBUILD haproxy-2.1.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
-EBUILD haproxy-2.2.11.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
-EBUILD haproxy-2.2.5-r1.ebuild 5417 BLAKE2B 21ad458ae0384f80859a1aea97d03671ddd001c60876fd9c0d596ad25da28e8c12a9e330ea7afcf3bbf68941fceb2995853f9a2833b3c6acd8bf5237454599b8 SHA512 1ef5ed092ce62f2b21bcd04e7a49ad3dd02573d6ddb9f87b54fe54c8b27b4b82fa19a267aa75f3ab09a8cb839cde6df8677a1959492f99a2ca83b316467392bc
-EBUILD haproxy-2.2.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
-EBUILD haproxy-2.3.7.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
-EBUILD haproxy-2.3.8.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
-EBUILD haproxy-2.3.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
+DIST haproxy-2.3.9.tar.gz 2928660 BLAKE2B 48b56aa72d50d4783bf54c6dbf642388d6f12d4e2ede09e86e9262d62a981177365dc2d2999e76c2be124c0576fe0b8d16a7a5bf412133fcbf87d45d8abfe3dd SHA512 49ee2a9be8dc7836e73be8e01ccbde52e29522f94d0bc80cf753fe76f4b32657fb123df7d443228afef36928f5a6cef67b693f05008a891001082b4264f015f6
+EBUILD haproxy-1.8.29.ebuild 4862 BLAKE2B a2274b5d45ed0d5d1ce3ae0150e1ffdeeffb09204486f3f3784b35798852976078f4b15b6a0c78dc2213bfb12979c71e1ef509dc7df91b57ce36bac981d6da91 SHA512 616b59595cdfe4143d44209597f50fcf147b389b8c776904a1ea04be29f1708c1940c1d9a4aee254b5108d2311f4be0328b749c40a8b9753a8a5743eeb597c6a
+EBUILD haproxy-1.8.30.ebuild 4862 BLAKE2B a2274b5d45ed0d5d1ce3ae0150e1ffdeeffb09204486f3f3784b35798852976078f4b15b6a0c78dc2213bfb12979c71e1ef509dc7df91b57ce36bac981d6da91 SHA512 616b59595cdfe4143d44209597f50fcf147b389b8c776904a1ea04be29f1708c1940c1d9a4aee254b5108d2311f4be0328b749c40a8b9753a8a5743eeb597c6a
+EBUILD haproxy-2.0.14-r2.ebuild 5399 BLAKE2B 6c36cb252b70d331721710d4b1793f9743ef7fc5277135a98fadba63e8565e48ffb0758a45b560db1d0d968f09a77ba082209ac3042cc285b04a22a16921f284 SHA512 7f12d55a8bdf745f2c30756d791cd23d90ac18b2b74c9f991a790ba9cb17b5c851bd12780b213c9110902a708cac8471d2ecc37176838beef5d424be2bf3b53b
+EBUILD haproxy-2.0.21.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
+EBUILD haproxy-2.0.22.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
+EBUILD haproxy-2.0.9999.ebuild 5280 BLAKE2B edccb304b97a9b1378d0078d7a18216610b4e4d67688325789b148ca919b5c8ddc50a29a572b7d641cf54f181ca8df912b522b5f94565d145e873ede1772697b SHA512 a4333f26aaed3a106c9e0660f0c343c14a4a09197deea9f66a689f694076bcba8cbc3eb4cbe63caaf3f316bc9484e2c558ab632b7740c0f2ca0638382a6f61a2
+EBUILD haproxy-2.2.12.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
+EBUILD haproxy-2.2.13.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
+EBUILD haproxy-2.2.5-r1.ebuild 5458 BLAKE2B b1715fc4d3354a6392cb45c280cffd579e0b7ace6fa05268fda65e7f11ed0bed9af8bac7fb550f548348de19d42553001b62c0c397004c50070cdac2d04c2dac SHA512 42a82233ff3c1b55883df477af5d5ead89de1739fe3bb006ebe994be4d158b833ab221b6936cf7850359b7f5e3cb62802f8053f416fb157e82708b947eb38aa3
+EBUILD haproxy-2.2.9999.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
+EBUILD haproxy-2.3.9.ebuild 5311 BLAKE2B 41b862242ce5575c77c7cdd71c93569ab57859027cdf8330dd751265b9d1d79f8b25a8bbccdf8bdfd4cd9f75b23c4ae572de64e6919b87da4576945e23c1292a SHA512 6be03b0872a2b3abee3fdc54cc7dfa0b6bd3401ccb7d599efdd6e1736808f29d9c8193026ee4956a9472f2f6a045ffba8e9fa42d0fcfff8d183ef6f96d1e8095
+EBUILD haproxy-2.3.9999.ebuild 5402 BLAKE2B 9e10f1e36e58bf47217e59a9775bb829ae7f74b29d3c11d5a0739bc84fd463e26ca051d717dd06e454a5ff1ce3e2ab34676b84f7a62bb4e7efa32f540e08d883 SHA512 aaeae78b0802950e44578927c53891edaebffef13d3564ed718fcb6b9c6c3e68343312a0c925fc8f25da524d611bea3e98dbb974776d1ab6fbb6d47df15107dd
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-1.8.29.ebuild b/net-proxy/haproxy/haproxy-1.8.29.ebuild
index 038c860b3686..861e6ae7a252 100644
--- a/net-proxy/haproxy/haproxy-1.8.29.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.29.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -112,8 +113,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-1.8.28.ebuild b/net-proxy/haproxy/haproxy-1.8.30.ebuild
index 038c860b3686..861e6ae7a252 100644
--- a/net-proxy/haproxy/haproxy-1.8.28.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.30.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -112,8 +113,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
index 6670f6b38cb9..bffd36a3ab43 100644
--- a/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -123,8 +124,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-2.0.21.ebuild b/net-proxy/haproxy/haproxy-2.0.21.ebuild
index 09bca46c32f8..94d32f6c96a7 100644
--- a/net-proxy/haproxy/haproxy-2.0.21.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.21.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -123,8 +124,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-2.2.11.ebuild b/net-proxy/haproxy/haproxy-2.0.22.ebuild
index 09bca46c32f8..94d32f6c96a7 100644
--- a/net-proxy/haproxy/haproxy-2.2.11.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.22.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -123,8 +124,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index 5b03cdb50b54..bdd4de3bca26 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -41,6 +41,7 @@ DEPEND="
 		!libressl? ( dev-libs/openssl:0=[zlib?] )
 		libressl? ( dev-libs/libressl:0= )
 	)
+	systemd? ( sys-apps/systemd )
 	slz? ( dev-libs/libslz:= )
 	zlib? ( sys-libs/zlib )
 	lua? ( dev-lang/lua:5.3 )
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -118,8 +119,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
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 6670f6b38cb9..000000000000
--- a/net-proxy/haproxy/haproxy-2.1.4-r2.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/$(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:= )
-	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.12.ebuild
index 09bca46c32f8..94d32f6c96a7 100644
--- a/net-proxy/haproxy/haproxy-2.1.12.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.12.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -123,8 +124,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-2.1.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.13.ebuild
index ff5a7fefefda..94d32f6c96a7 100644
--- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -123,8 +124,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
index 6ffafb13f3cf..2c82ff8d7230 100644
--- a/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -55,9 +56,9 @@ PATCHES=( "${FILESDIR}/${PN}-2.3.0-hpack-VAR_ARRAY.patch" )
 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -124,8 +125,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index ff5a7fefefda..94d32f6c96a7 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -123,8 +124,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
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 b7ea2373967e..000000000000
--- a/net-proxy/haproxy/haproxy-2.3.8.ebuild
+++ /dev/null
@@ -1,177 +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:= )
-	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.7.ebuild b/net-proxy/haproxy/haproxy-2.3.9.ebuild
index b7ea2373967e..463b8b547e69 100644
--- a/net-proxy/haproxy/haproxy-2.3.7.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -120,8 +121,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
index ff5a7fefefda..94d32f6c96a7 100644
--- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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
+inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -42,6 +42,7 @@ DEPEND="
 		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 )"
@@ -54,9 +55,9 @@ 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 )
+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 )
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
 
 haproxy_use() {
 	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -123,8 +124,8 @@ src_install() {
 	dosbin haproxy
 	dosym ../sbin/haproxy /usr/bin/haproxy
 
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
 
 	doman doc/haproxy.1
 
diff --git a/net-proxy/havp/Manifest b/net-proxy/havp/Manifest
index 4c4cba3094da..21e41964b540 100644
--- a/net-proxy/havp/Manifest
+++ b/net-proxy/havp/Manifest
@@ -2,5 +2,5 @@ AUX havp-0.92a-pkg-config-libclamav.patch 1479 BLAKE2B b52880a1f776aa21a2623aa71
 AUX havp-0.92a-run.patch 1084 BLAKE2B 82d5c1fe4ba2b55d398c056d7858c3a571bae5affbe8e220681d89cfcfed3fb05e9d0c34fc54fed5c170f81c8810dcadd1f6a660592571729cc6d3d6c5fed957 SHA512 e8e213b635984ef67a81917fc33eb086d31400b009e657da0dc96bc4fc46659dd41ede9a4a809d7221a949564e38fbb613e649b45fb9555bc4989548eac993e6
 AUX havp.initd 1523 BLAKE2B 165a6cacdd65ee037f86b36973fa95b43e895438536b76b54ec44fa13ceeeea9abcc428a1fb6ea5fa04800118e0f81c367cc9d6f2d7b230e79d04701e0bf4508 SHA512 ada07f2c6037b101b4b9563b2b9056447520f5b30c59e0606e7f1641f5da097a8619672ff021faa6627d224d89a3242dd8130f22d56d835be913dbcb11f355d7
 DIST havp-0.92a.tar.gz 121987 BLAKE2B 9d34d789ac1c5e6785fc337d661d48797d2622ec6638765219486ca8110c1ff2cb8e365f677bda68940bebaa41f339bfb3c561e08dc259b7ae9ca204964495c6 SHA512 3eb742519795a7d10520bdc1c78af0d3bf580a56e14f90bff9f519607a4e82cbf704372bd6da2fc05fcd436d580f4c226874d8df7770d22e2160b5d01afb9c62
-EBUILD havp-0.92a-r2.ebuild 1817 BLAKE2B c1a452ae5302488c5c8fa274c30ceb890bce1fe540c486f9e0cd5391d6ee09483f13affae1ebb5d22568b6b5f41710273f272b19e933dba1b2521b80e7e65616 SHA512 1294724855be37556111e8a1f1c5fc8143262f5e6c78014a4a538209008e49efbe01e22d4c972b37881ec6cc726b31b26bce7f93db832dd8b6e27b379cae7e2c
+EBUILD havp-0.92a-r3.ebuild 1806 BLAKE2B bd29c4fafc4be01f56b2428e8f5089884bedca6b4b10795fc25b69d949100c4d808b5bd7558115cd3c93e41a407b0c4e35ad60400bc68350c0be2dcd6c1bad54 SHA512 4d4d035175e9a007a1acd843b1d7cdae326bfbd7df17f0a258e2b8f402820041500f083989f35ad96fa91de8f4ce9946437e435cde1e63d8cdeb36242a6abe1e
 MISC metadata.xml 305 BLAKE2B d11f8994a06d4eb9c00d969a622bad3115eb391e8fab610d7328885da36656f16dc7bca1bfc91a20969a9a1711b10af795e21da81702744f388ef9338d5e0de2 SHA512 9d35bba251c660db53dbb238edff0ac868f79d8101a3b2ea9e950593f5587f417d657c02c51afcb425195df40577403a4f1fac80ef474043e4dc21add9fd1c1e
diff --git a/net-proxy/havp/havp-0.92a-r2.ebuild b/net-proxy/havp/havp-0.92a-r3.ebuild
index 973a5a81aee3..e29ca2eab914 100644
--- a/net-proxy/havp/havp-0.92a-r2.ebuild
+++ b/net-proxy/havp/havp-0.92a-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils toolchain-funcs user
+inherit autotools toolchain-funcs
 
 DESCRIPTION="HTTP AntiVirus Proxy"
 HOMEPAGE="http://www.server-side.de/"
@@ -15,17 +15,19 @@ KEYWORDS="amd64 x86"
 IUSE="clamav ssl"
 
 DEPEND="clamav? ( >=app-antivirus/clamav-0.98.5 )"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	acct-group/havp
+	acct-user/havp
+"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /etc/${PN} ${PN}
-}
+PATCHES=(
+	"${FILESDIR}"/havp-0.92a-run.patch
+	"${FILESDIR}"/${P}-pkg-config-libclamav.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.92a-run.patch \
-		"${FILESDIR}"/${P}-pkg-config-libclamav.patch
+	default
 
 	sed -i configure.in -e '/^CFLAGS=/d' || die
 	mv configure.{in,ac} || die
@@ -36,26 +38,30 @@ src_prepare() {
 src_configure() {
 	tc-export AR
 	export CFLAGS="${CXXFLAGS}"
-	econf \
-		$(use_enable clamav) \
-		$(use_enable ssl ssl-tunnel) \
+
+	local myeconfargs=(
+		$(use_enable clamav)
+		$(use_enable ssl ssl-tunnel)
 		--localstatedir=/var
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	dosbin ${PN}/${PN}
+	dosbin havp/havp
 
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newinitd "${FILESDIR}/havp.initd" havp
 
+	rm -r etc/havp/havp.config.in || die
 	insinto /etc
-	rm -r etc/${PN}/${PN}.config.in
-	doins -r etc/${PN}
+	doins -r etc/havp
 
-	dodoc ChangeLog
+	einstalldocs
 }
 
 pkg_postinst() {
-	ewarn "/var/tmp/${PN} must be on a filesystem with mandatory locks!"
+	ewarn "/var/tmp/havp must be on a filesystem with mandatory locks!"
 	ewarn "You should add  \"mand\" to the mount options on the relevant line in /etc/fstab."
 
 	if use ssl; then
@@ -69,7 +75,7 @@ pkg_postinst() {
 	if use clamav; then
 		echo
 		ewarn "If you plan to use clamav daemon, you should make sure clamav user can read"
-		ewarn "/var/tmp/${PN} content. This can be accomplished by enabling AllowSupplementaryGroups"
-		ewarn "in /etc/clamd.conf and adding clamav user to the ${PN} group."
+		ewarn "/var/tmp/havp content. This can be accomplished by enabling AllowSupplementaryGroups"
+		ewarn "in /etc/clamd.conf and adding clamav user to the havp group."
 	fi
 }
diff --git a/net-proxy/nutcracker/Manifest b/net-proxy/nutcracker/Manifest
index 5d741d3edd0c..2356fe1328bb 100644
--- a/net-proxy/nutcracker/Manifest
+++ b/net-proxy/nutcracker/Manifest
@@ -1,8 +1,8 @@
-AUX nutcracker-0.3.0-use-system-libyaml.patch 2183 BLAKE2B ad2cdffe2f038bf6715714f02d66d4610abb0abed2b5664e501a00e0340c2f20d7a06835322fab0369fc4747cd08ff010f028ab705181f881eda0c5c7b1c0145 SHA512 b37037f9089f0bc3eec53916e204986674e14d806028672fa723a453e274fe64a6290c14aaaebcaabaf1237069a6563fb736af5919421573050fe1b006472937
+AUX nutcracker-0.3.0-use-system-libyaml.patch 1633 BLAKE2B 07fa4384987fdefae8ea6dd53cec0774434791a55ff873bd4921dbad314b745052dcfbcc29e18221cca0a4a6845d99b774f86949924a1e8d2bb5083c216288b4 SHA512 ed818b96c4c4c9e149eda91a7daca242b144496b00421c286d9f9e88863e3df8382835d2556bb988ff019d7cffee791ed35d4fefeef486bd6972c4bbbc1319f5
 AUX nutcracker.confd 271 BLAKE2B 5f8a19edd4841cbc8b86f14ec48b72a46be95f34050619a6e1d75b12a348c11dab9890f1bbfaceff262256977888c378d2eee2ffb8c7b5c97e75bcc9c6e61502 SHA512 491b0330fda3994bedc15a77e7b4f601a2a0c234298ff04ee088f0e4a9676864e0eb01e1532f2cb6fdf95cefe0b0b0cf39d84b0993cadff774e7721f22d8c752
 AUX nutcracker.confd.2 272 BLAKE2B dfcfdfb4134ce0acfb126b1c7cb32062e47906dd68ed109a4e9edbae9c56f4b1ae17b20f593ef5af904bbe85837f5bb9ff91e0e068acfdff82e949b623abb55a SHA512 d208654b1e1fd20f456f340fabe25836c8ba948c96db8034d41710f9e0362936a24f0faec89e51c04d478c60de5255c9d238ab00d7d7b778a0619061a8cbce4c
 AUX nutcracker.initd 890 BLAKE2B a06886319400baa7b38fc32fb2961c80def5298e733977317edc158eef265d913b1437427b47e383f4c8ce0e65cf3d2d5117865ed542fc1ecc0a1f964356b7b8 SHA512 f40d692daa3cad7d7bce85ac0ecb01ca93f28f79e74b8a5bbea38930f78b24578b47fd7c44e36217ce60fee1ac3faefd8cd6d923046b339ec00c8fcc0f05f4fb
 AUX nutcracker.initd.2 891 BLAKE2B c643a511d2e402477c0862b67cdebb244fc2205466d78bc3cdb74b1f63b1659fef6bc0480d6950b5e00c0d9e84e072050f3bedb5d7931ee904c233313290e20b SHA512 ab06f875dca4ae27b4536d84c9342ec362e6f45f20efd370da0cb6073b306eeb0a1166737f6bdba3e1d5fe836d6b708729b7eadbab62cf66151649d2f56414eb
 DIST nutcracker-0.4.1.tar.gz 1163442 BLAKE2B 6838fbb5623ad49ef564176ba4c7d4e61cedb9693851cacc06d8ed09e3045b8cff9df1af8e21790cfa0e3f988b81a9c9cfa852449d532a432c05f3f4c3eace56 SHA512 581fae1d12feb983ed25b22cd6f597fd28b7070906ac29d3990669ae5c626a468914021cee152a6a2299a2838c838ad907e4c911b911ef04166ac7bbb2982da1
-EBUILD nutcracker-0.4.1-r1.ebuild 945 BLAKE2B 035e4388a33b31aca64ff31265b2ca9b7009bed0c63b621cf5d6002f08643ef0e44d3870755c66ec416e1bff3ed2dc4acd928b470ae9dab7e52a7308bb87d412 SHA512 5253d7d16427ad5f25650a741aa835b8130f632df98be16b92a9ae52f5d81da620cf578752e39ef42ff080188ba203b57dd922de9ddf53332d7e3ffca85ce3f8
+EBUILD nutcracker-0.4.1-r1.ebuild 967 BLAKE2B fdbb5f9bb2994b464ee5747f1c1d6eee86cf16fb9564cb7f342f6ca2be275f9bdafb0b9c48476266cab173eac951d1cb3d770e4701ea2bfb21285f1919593066 SHA512 3141ebbaa5868aef9858ed910a630e0767eb849979470bc23b65114b4266c311e93868efd2054b6279764b4522d11c91681788e83578d945582efd11e020ec2f
 MISC metadata.xml 329 BLAKE2B c3b117fab3b6d2d5f01572e797c946d89bfead4d46853df0aa03da840fde527fbaec9d070446872aabd632a3a27f2a0ad82a4164df0c58fa132a8b51e38828ea SHA512 26a39f6d3e84b5ec4f59c9f7167593f3f340be020401213a0339d027ddcbbcebbb512313c39ed1a3e61007b16f85737dc23e2f091413a4ef91d3675fd2ea2034
diff --git a/net-proxy/nutcracker/files/nutcracker-0.3.0-use-system-libyaml.patch b/net-proxy/nutcracker/files/nutcracker-0.3.0-use-system-libyaml.patch
index 8a30fae46fc1..a3cccd3cc5c0 100644
--- a/net-proxy/nutcracker/files/nutcracker-0.3.0-use-system-libyaml.patch
+++ b/net-proxy/nutcracker/files/nutcracker-0.3.0-use-system-libyaml.patch
@@ -1,6 +1,5 @@
-diff -uNr nutcracker-0.3.0.orig/configure.ac nutcracker-0.3.0/configure.ac
---- nutcracker-0.3.0.orig/configure.ac	2014-03-17 17:55:54.500000001 -0400
-+++ nutcracker-0.3.0/configure.ac	2014-03-17 17:58:50.290000001 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -195,11 +195,8 @@
    [AC_DEFINE([HAVE_STATS], [1], [Define to 1 if stats is not disabled])])
  AC_MSG_RESULT($disable_stats)
@@ -15,9 +14,8 @@ diff -uNr nutcracker-0.3.0.orig/configure.ac nutcracker-0.3.0/configure.ac
  
  # Define Makefiles
  AC_CONFIG_FILES([Makefile
-diff -uNr nutcracker-0.3.0.orig/Makefile.am nutcracker-0.3.0/Makefile.am
---- nutcracker-0.3.0.orig/Makefile.am	2014-03-17 17:55:54.500000001 -0400
-+++ nutcracker-0.3.0/Makefile.am	2014-03-17 17:56:38.920000001 -0400
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -2,7 +2,7 @@
  
  ACLOCAL_AMFLAGS = -I m4
@@ -27,9 +25,8 @@ diff -uNr nutcracker-0.3.0.orig/Makefile.am nutcracker-0.3.0/Makefile.am
  
  dist_man_MANS = man/nutcracker.8
  
-diff -uNr nutcracker-0.3.0.orig/src/Makefile.am nutcracker-0.3.0/src/Makefile.am
---- nutcracker-0.3.0.orig/src/Makefile.am	2014-03-17 17:55:54.500000001 -0400
-+++ nutcracker-0.3.0/src/Makefile.am	2014-03-17 18:00:08.480000001 -0400
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -7,7 +7,6 @@
  AM_CPPFLAGS += -I $(top_srcdir)/src/hashkit
  AM_CPPFLAGS += -I $(top_srcdir)/src/proto
diff --git a/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild b/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
index 7fa901b297c4..3203b919e775 100644
--- a/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
+++ b/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
-DESCRIPTION="A fast, light-weight proxy for Memcached and Redis.
-(Twitter's Twemproxy)"
+DESCRIPTION="A fast, light-weight proxy for Memcached and Redis. (Twitter's Twemproxy)"
 HOMEPAGE="https://github.com/twitter/twemproxy"
-SRC_URI="https://github.com/twitter/twemproxy/archive/v0.4.1.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/twitter/twemproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/twemproxy-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -17,12 +17,16 @@ IUSE="debug doc"
 
 DEPEND=">=dev-libs/libyaml-0.1.4"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/twemproxy-${PV}"
+PATCHES=(
+	# Let's use system libyaml
+	"${FILESDIR}"/${PN}-0.3.0-use-system-libyaml.patch
+)
 
 src_prepare() {
-	# Lets use system libyaml
-	epatch "${FILESDIR}/${PN}-0.3.0-use-system-libyaml.patch"
+	default
+
 	eautoreconf
 }
 
@@ -31,7 +35,7 @@ src_configure() {
 }
 
 src_install() {
-	default_src_install
+	default
 
 	insinto /etc/nutcracker
 	newins conf/nutcracker.yml nutcracker.yml.example
diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest
index 3e12d9ad1637..e9096f4124c9 100644
--- a/net-proxy/privoxy/Manifest
+++ b/net-proxy/privoxy/Manifest
@@ -1,11 +1,8 @@
 AUX privoxy-3.0.28-strip.patch 1784 BLAKE2B 4f92d7a34a9023405cca813629bb9b200d802061c49d72c0aa413d16b3e714d723c4aba48640e050b0960559a0170bc688742deeb8bcd233eee96be0cfc1bb7b SHA512 78713e7bf1379a0e65c775e415e15ed140873cc48b388d46ce79a24acf64f5c777f1e0e489d912fa7bff8b6acc910fd074e0d755116e4e5d52194d483a30ed67
-AUX privoxy-3.0.29-gentoo.patch 4437 BLAKE2B 59578cd3df07a4d4e40e4b340a92fa174d0e492ef0352ae4456fc6715a3a171385306e3f3b2c9a441d3b28fda12b655bf6f397ba5b1c4e23878c1fe31dbc42c9 SHA512 779b998ecff335c48aaf7408a43ae4ef86486dae81a196ecc7cec72662eafcafb13d0b919c274387bc4217fce294582cef8bb1a697a67fe3dc64b797a786768b
 AUX privoxy-3.0.32-gentoo.patch 4309 BLAKE2B 609960b124bbd66d3246f071f93c43a552a48937b8c3540d2b0267845f64ce84d2daeefb0880895291b698f22660d86b2bb089621ccaf250a343b3b80dab1425 SHA512 fb6a0f4ea2b0d3ee22c605f25339c80a7b5448cd8cdfd3e7a50c825ddf6a887121771e475f1c17be4ba6fc5ac00b4524f3819e5ba6ae25e772fed68b3d879914
 AUX privoxy.initd-3 639 BLAKE2B 69d935e42ef4bf79868e0b457751b1dfb6a0b5805d19c74bdef007b54ad60adab784f98c4a9898306778cc41157f91b029978a6534aa00c0b00fcecdbc1ca11f SHA512 0bfd7ab2e42c4905f2542a4dbd93cf30d15a8808d527e6bcb6b14f75de226c94c0e0dea6ff69bbac37d3da605acfa2035e2d0e9fe0a41d7beb33cfea5ed2340b
 AUX privoxy.logrotate 191 BLAKE2B 587f6211d4938481a1dac77b79a1c32ea491c88514ed7dd42f1cdd7e2c344bfa1a4cde29010a5700f7a1847df1f91e9e59ffed45a386ba12a3cf29fac12a5488 SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9
 AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32979627608f2a3926b2459822c827d557a86c20da5c8c6291941eb01db9adc7fb458e913672d574a0 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0
-DIST privoxy-3.0.31-stable-src.tar.gz 1839901 BLAKE2B 08564fb8de37d334844de10dfecc39b3f10cee996b3931be4e2d7e33eccd7ec115d7487353496de0fd645fc76ea237aa907eda2fb7fa8aad14050280fc083cc7 SHA512 0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed
 DIST privoxy-3.0.32-stable-src.tar.gz 1834528 BLAKE2B c846dada5fd34b80be9f7a75dc4177f3907241f6cf28b4120929687523d449d73b6a78bfe73f0a1086fbb3a8388103beb1e5a62becdffa24bf57d34cbb6cda56 SHA512 da41c0045bf593219df64718645eff984b5df43737811cc0fa12fce7e8ae1ab59eefbe20f23d6ce8f62216cfd81f1a9c319688d15693c25eed36010f3e1d5ffd
-EBUILD privoxy-3.0.31.ebuild 3974 BLAKE2B eea99412188d5fc31970baef82cf1397ab1cc763a6db4c6eb83fd50e55cd5afd2a0c72e4e2413c6f1b75216f30222cb4d50e28ae0a33bbacfd7ae056a59c8e23 SHA512 b0f1165f1817316ff2abb43b01f73d79f514648ba74bffba9de720fd69b9ccb1a9283c91f94759503210471a69c793da7cdf45f4186c588cd37cacb18cd91042
 EBUILD privoxy-3.0.32.ebuild 3999 BLAKE2B 3748a08db2f9e0c275f12fc6a796b549d9727a3d290110a430aedd4419779843cbdb42ce109beae7e9390d18868a7e91ab6ef8f30362b124cd8a0223731977f9 SHA512 a31005ced871206007b3b6b9009d79f5eb2c737cb6bba62bdf26d05800e5c8feb3f9e95f0137892e3d19b0977204f91d52dfff724aba026971ecb570a0d0bea1
 MISC metadata.xml 2796 BLAKE2B 2da7f1b6b5cbdd5a175d017b579b902fee758821b49e5d5cdc172f0b85fa41accd90c571e447867aa6324f1913b3fea90e2d9d9d981640ebe99735a5dabbd6ac SHA512 d1452008357be66b661c500f9f352afb94c1c221a3afbaa3e6b27d3e576232259ee50ea81890119d7c8dda153a3587f3de0f732fe097f4097293b06736ab921b
diff --git a/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch b/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch
deleted file mode 100644
index 572d03439b97..000000000000
--- a/net-proxy/privoxy/files/privoxy-3.0.29-gentoo.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/config privoxy-3.0.29-stable/config
---- privoxy-3.0.29-stable.orig/config	2020-11-28 13:19:00.000000000 +0300
-+++ privoxy-3.0.29-stable/config	2021-01-06 19:44:52.824746891 +0300
-@@ -259,7 +259,7 @@
- #
- #      No trailing "/", please.
- #
--confdir .
-+confdir /etc/privoxy
- #
- #  2.2. templdir
- #  ==============
-@@ -344,7 +344,7 @@
- #
- #      No trailing "/", please.
- #
--logdir .
-+logdir /var/log/privoxy
- #
- #  2.5. actionsfile
- #  =================
-@@ -477,7 +477,7 @@
- #      require additional software to do it. For details, please
- #      refer to the documentation for your operating system.
- #
--logfile logfile
-+logfile privoxy.log
- #
- #  2.8. trustfile
- #  ===============
-diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/default.action.master privoxy-3.0.29-stable/default.action.master
---- privoxy-3.0.29-stable.orig/default.action.master	2020-11-28 13:19:00.000000000 +0300
-+++ privoxy-3.0.29-stable/default.action.master	2021-01-06 19:44:52.825746892 +0300
-@@ -559,7 +559,7 @@
- +client-header-tagger{image-requests} \
- +client-header-tagger{range-requests} \
- +hide-from-header{block} \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Cautious
- 
-@@ -582,7 +582,7 @@
- +hide-from-header{block} \
- +hide-referrer{conditional-block} \
- +session-cookies-only \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Medium
- 
-@@ -622,7 +622,7 @@
- +hide-referrer{conditional-block} \
- +limit-connect{,} \
- +overwrite-last-modified{randomize} \
--+set-image-blocker{pattern} \
-++set-image-blocker{blank} \
- }
- standard.Advanced
- 
-diff '--color=auto' -Naur privoxy-3.0.29-stable.orig/GNUmakefile.in privoxy-3.0.29-stable/GNUmakefile.in
---- privoxy-3.0.29-stable.orig/GNUmakefile.in	2020-11-28 13:19:00.000000000 +0300
-+++ privoxy-3.0.29-stable/GNUmakefile.in	2021-01-06 19:45:20.535798829 +0300
-@@ -62,8 +62,8 @@
- MAN_DEST     = $(MAN_DIR)/man1
- MAN_PAGE     = privoxy.1
- SHARE_DEST   = @datadir@
--DOC_DEST     = $(SHARE_DEST)/doc/privoxy
--VAR_DEST     = @localstatedir@
-+DOC_DEST     = @docdir@
-+VAR_DEST     = /var
- LOGS_DEST    = $(VAR_DEST)/log/privoxy
- PIDS_DEST    = $(VAR_DEST)/run
- 
-@@ -890,8 +890,6 @@
- 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/man-page/*html $(DESTDIR)$$DOC/man-page;\
- 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/privoxy-index.html $(DESTDIR)$$DOC/index.html;\
- 		$(INSTALL) $(INSTALL_T) AUTHORS $(DESTDIR)$$DOC;\
--		$(INSTALL) $(INSTALL_T) LICENSE $(DESTDIR)$$DOC;\
--		$(INSTALL) $(INSTALL_T) LICENSE.GPLv3 $(DESTDIR)$$DOC;\
- 		$(INSTALL) $(INSTALL_T) README $(DESTDIR)$$DOC;\
- 		$(INSTALL) $(INSTALL_T) ChangeLog $(DESTDIR)$$DOC;\
- 		$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC;\
-@@ -962,34 +960,8 @@
- 	fi ;\
- 	$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
- 	for i in $(CONFIGS); do \
--		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
--			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
--			$(ECHO) Installing fresh $$i;\
- 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
--		elif [ -s "$(CONF_DEST)/$$i" ]; then \
--			$(ECHO) Installing $$i as $$i.new ;\
--			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
--			NEW=1;\
--		else \
--			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
--		fi ;\
- 	done ;\
--	if [ -n "$$NEW" ]; then \
--		$(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
--		$(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
--	fi ;\
--	[ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
--		$(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
--		$(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
--	if [ x$$USER != x ]; then \
--		$(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile || \
--		$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
--	fi ;\
--	if [ x$$GROUP_T != x ]; then \
--		$(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile || \
--		$(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
--	fi ;\
--	$(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
- 	if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
- 		if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
-                $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
diff --git a/net-proxy/privoxy/privoxy-3.0.31.ebuild b/net-proxy/privoxy/privoxy-3.0.31.ebuild
deleted file mode 100644
index a6a68fbfe1bb..000000000000
--- a/net-proxy/privoxy/privoxy-3.0.31.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd toolchain-funcs
-
-[ "${PV##*_}" = "beta" ] &&
-	PRIVOXY_STATUS="beta" ||
-	PRIVOXY_STATUS="stable"
-
-HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/"
-DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy"
-SRC_URI="mirror://sourceforge/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz"
-
-IUSE="+acl brotli client-tags compression editor extended-host-patterns
-extended-statistics external-filters +fast-redirects +force fuzz
-graceful-termination +image-blocking ipv6 lfs +mbedtls openssl
-png-images selinux ssl +stats +threads toggle tools whitelists
-+zlib"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86"
-LICENSE="GPL-2+"
-
-DEPEND="
-	acct-group/privoxy
-	acct-user/privoxy
-	dev-libs/libpcre
-	brotli? ( app-arch/brotli )
-	ssl? (
-		mbedtls? ( net-libs/mbedtls )
-		openssl? ( dev-libs/openssl )
-	)
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}
-	extended-host-patterns? ( dev-lang/perl )
-	selinux? ( sec-policy/selinux-privoxy )
-	tools? (
-		net-misc/curl
-		dev-lang/perl
-	)
-"
-REQUIRED_USE="
-	client-tags? ( threads )
-	toggle? ( editor )
-	compression? ( zlib )
-	brotli? ( zlib )
-	fuzz? ( zlib )
-	ssl? ( ^^ ( mbedtls openssl ) threads )
-"
-
-S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.29-gentoo.patch
-	"${FILESDIR}"/${PN}-3.0.28-strip.patch
-)
-
-pkg_pretend() {
-	if ! use threads; then
-		ewarn
-		ewarn "Privoxy may be very slow without threads support, consider to enable them."
-		ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS"
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die
-
-	# autoreconf needs to be called even if we don't modify any autotools source files
-	# See main makefile
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--without-mbedtls --without-openssl"
-	if use ssl; then
-		myconf="$(use_with mbedtls) $(use_with openssl)"
-	fi
-
-	# --with-debug only enables debug CFLAGS
-	# --with-docbook and --with-db2html and their deps are useless,
-	#	since docs are already pregenerated in the source tarball
-	econf \
-		--sysconfdir=/etc/privoxy \
-		--enable-dynamic-pcre \
-		--with-user=privoxy \
-		--with-group=privoxy \
-		$(use_enable acl acl-support) \
-		$(use_enable compression) \
-		$(use_enable client-tags) \
-		$(use_enable editor) \
-		$(use_enable extended-host-patterns pcre-host-patterns) \
-		$(use_enable extended-statistics) \
-		$(use_enable fast-redirects) \
-		$(use_enable force) \
-		$(use_enable fuzz) \
-		$(use_enable graceful-termination) \
-		$(use_enable image-blocking) \
-		$(use_enable ipv6 ipv6-support) \
-		$(use_enable kernel_FreeBSD accept-filter) \
-		$(use_enable lfs large-file-support) \
-		$(use_enable png-images no-gifs) \
-		$(use_enable stats) \
-		$(use_enable threads pthread) \
-		$(use_enable toggle) \
-		$(use_enable whitelists trust-files) \
-		$(use_enable zlib) \
-		$(use_with brotli) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/privoxy.initd-3" privoxy
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/privoxy.logrotate" privoxy
-
-	diropts -m 0750 -g privoxy -o privoxy
-	keepdir /var/log/privoxy
-
-	use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl
-	if use tools; then
-		dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl}
-		newbin tools/uagen.pl privoxy-uagen.pl
-	fi
-
-	rmdir "${ED}/var/run" || die
-	chown privoxy:root "${ED}/etc/privoxy" || die
-}
-
-pkg_postinst() {
-	if use extended-host-patterns; then
-		ewarn
-		ewarn "You enabled extended-host-patterns, now you *must* convert all action files in"
-		ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool"
-		ewarn "privoxy-url-pattern-translator.pl is available."
-		ewarn
-	fi
-}
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index cc2e247cbb3b..6610902cd9da 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -1,5 +1,5 @@
 AUX shadowsocks.initd 1413 BLAKE2B 0a60cc154df3c26326d684fd3a9dbcc7beae50e2a8cb290e4caff013a338ef4fcf493be4be010573750f56c4bd9f339f3f0a98a506480fa2928dc6cb7e67ef8e SHA512 8edf2b09ee8fb48e2236447c640342132a188313956f10df73535c740934d5a610e2fd1b618b6822802d4fc7f3244933242434a0966ec2b4f8e3c4132caa3d43
 AUX shadowsocks.json 132 BLAKE2B 84f0dbdf0a7eb5d1c8d8ca26147b5dde872a78b128357fa4d3d1348afdc4bd3bdd87f73c564d030e9cdc19a0e5fe2d414a5430f2daeddd03c0a24b761460596a SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef
 DIST shadowsocks-libev-3.3.5.tar.gz 303368 BLAKE2B bb7d6e64596710402db94085044c20315028395723828fa82dfba419bc41a0c740ece1f79c6cf05dda395d9442d553429f66d7f7b2de3cdd188d5b6adb0b8edf SHA512 c0cc869b4b7661ebd348bd5559c6a17c44b66a5f42374d97023adcfb525d934da3ed96245ff792ebc74870d30dd8f71fadcd89c79b2cd8a98d551ff7592508d0
-EBUILD shadowsocks-libev-3.3.5.ebuild 2056 BLAKE2B 120043f257221ed6a7776ef7f799f9fed9c2f543fe1aa19532736ac3b8502d89a2d5e22d0f9d10dd05bcaddf31f18e6854048c2a9f0f085cee3e6dc5452fb372 SHA512 6301b2d18a000a393301480e8b70641c84847229cb7d45ec5db227554751a1111044d7de2d998e9aabef9f2969d7e5bd2ec2913f851eb2858bcf2aea17f7f316
+EBUILD shadowsocks-libev-3.3.5.ebuild 2049 BLAKE2B e08142985ea3ce5b99e847e6b37ef58d0d0cb89ddd7adaf90df5db1ba018a03929c484dc3e4b75f2976e5a17cc6c26aee6c730c3fd66fab118bf0204173268c0 SHA512 84761cfd58016cd37c4393dcb10c7fb11fde9cc8854af2006ccd3cd7bce5d7fae144dae689973f7c9953432f0ebaf52f33d03081c03a7aef07ad3cd79de97395
 MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
index 4829df5517b7..09aae5d8e6d1 100644
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_PV="v${PV}"
-inherit autotools eutils systemd
+inherit autotools systemd
 
 DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
 HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index 515194ff5c6c..e06d159ab6a1 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -2,5 +2,7 @@ AUX tinyproxy-1.10.0.initd 855 BLAKE2B 4bd9a260a930958ea449a08edce1f9e8633429a52
 AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca809aca67b658bb13917869e5203d66730f52670fb9030dd9f6cf249d09f357bbdd143436f6b358377d8f78036 SHA512 7721b986326f82b03d79983be33047fdf4b37b5c63992645a321bf8bd3edea63680a2bf81b2d51fbeab2a5884773a0598dba14f9d597d3db0eea7c7f6b4c79d3
 AUX tinyproxy.tmpfiles.conf 48 BLAKE2B f2cd35878580eb198920f5db8493e3e266b4325160a9590a0b59bef1cf0577d0129bb636d99442cdb2154b444a8cdc1c6d01b4850b57df774be00338c61902e4 SHA512 24440cdaed0af6cbdb191acb1769e0a17871ef95e03e62a6621a413a2616e5d90d748d909bb5d18c029b25d7bf91485dbe46ee11e8703a1cb9008be470536715
 DIST tinyproxy-1.11.0-rc1.tar.xz 176732 BLAKE2B a448c90b17a8d3256aec1dba4307e9bce87ac421a67486e4987afbf22e49041971138f09e98a4a775cc05071b73b4f1b34e652eb2c0992b2a5fa1861a0df26b2 SHA512 e1d05777072d178c66d1f007163bcb4b3a0b1dfdf460881daaf962b5f1c0d0213ec5403bf50c161d811f46c8b50a476cd534f535962ec01b70fbb955471c1af1
+DIST tinyproxy-1.11.0.tar.xz 177664 BLAKE2B 6ea74ef0fff22fbc6e04b37519151fda771a7d3e789d94cbd2a77a76dce7b16151cfbad83ac665a5c1fdb7334cd4d26ed6d2bc73f70b3858ffe439b16698fd2e SHA512 c0ff2a90da2352e6021efc87d1293b85f2a7588b2a1ab13bd96d906382eda8188b22b01f9acb2d200fd570bf3ec9484fa370cae6834d1f055c0af1631d22ae9d
+EBUILD tinyproxy-1.11.0.ebuild 1722 BLAKE2B 7d01324e0e825dedc25e1cd9b37820d1bb60227397faec109c214500ecacaadf8ef079e5f2327b78188254625c7555b37d018170d41e819f90efe45b0cb9270c SHA512 cee971ea6980ed385bc40f28992e696d767af982b63331570294fed61bc41081529e3a30205836f2bb5457e57e77bcfb9549339e3993d50433eb5473c7ecdab1
 EBUILD tinyproxy-1.11.0_rc1.ebuild 1719 BLAKE2B b8a013fc7c996cca345f688f89f0017cbd8d3eb2eb6e62ad1f0ec9b2419a834c901dc45e68f2963906025870d76eb42b4f4fddf4fb8eb483319bca85608fd4aa SHA512 131ae575e82b52f495286c34b5accc8ed3902a83d91ed3d6ad159848ef2fc5e005d7ec06bd8afb0e296ae9294dbb519ea3d6e167eb7082606556342b962aa3e6
 MISC metadata.xml 562 BLAKE2B db41afc703d1338c10ef24e682a96b5a945bc80fd4a4e798fa7e74fdfbb9b1b8449a9126b8506e60524e733fc4810a1499e1320e565840798f8bea4722d46380 SHA512 ade2407ef37db41cef982bee16d02621813899fff1c4c3eaa00dd7517af254def7ecf08f508a1e873eaf5d2843df22154272bf58f84954e512614107d333805c
diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.0.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.0.ebuild
new file mode 100644
index 000000000000..0f0cb9c579fa
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.11.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd tmpfiles
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A lightweight HTTP/SSL proxy"
+HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
+SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
++upstream-proxy +xtinyproxy-header"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( xtinyproxy-header )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DEPEND="
+	acct-group/tinyproxy
+	acct-user/tinyproxy
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|nobody|${PN}|g" \
+		etc/${PN}.conf.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable filter-proxy filter) \
+		$(use_enable reverse-proxy reverse) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable upstream-proxy upstream) \
+		$(use_enable xtinyproxy-header xtinyproxy) \
+		--localstatedir=/var
+}
+
+src_test() {
+	# The make check target does not run the test suite
+	emake test
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	diropts -m0775 -o ${PN} -g ${PN}
+	keepdir /var/log/${PN}
+
+	newinitd "${FILESDIR}"/${PN}-1.10.0.initd tinyproxy
+	systemd_newunit "${FILESDIR}"/${PN}-1.10.0.service tinyproxy.service
+	dotmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
+	elog "For filtering domains and URLs, enable filter option in the configuration"
+	elog "file and add them to the filter file (one domain or URL per line)."
+}
diff --git a/net-proxy/wwwoffle/Manifest b/net-proxy/wwwoffle/Manifest
index 0f144a53d60a..3d29ef0542b7 100644
--- a/net-proxy/wwwoffle/Manifest
+++ b/net-proxy/wwwoffle/Manifest
@@ -3,5 +3,5 @@ AUX wwwoffle-online.confd 305 BLAKE2B 42037033ca0b12993cc0c1c6e5d1d6f7665df07233
 AUX wwwoffle-online.initd 576 BLAKE2B e929f32ba1fef07faf66b505e59e75243eafd35f1bc0c35d0996479e3f905c00f4a11ab41dc951cfc750a7587d43844222ae4a14454a8236affe3bec62ec1087 SHA512 bd5950969e19e8b99b798939e00c00d0325369502a5552507066900ab02b67e06ee8ae25f450fc7df48ce9dd19e4fc6aae969f9fd3e055564fea000a34904af8
 AUX wwwoffle.initd 426 BLAKE2B e92e7ad6fae5e25e1862664e0411a697be5d4440e3b6450adaab5b9118f30a57be31ad7e33775ce96d7ace85bc9167beca2e3f27393de5b99a29b03f5653f9f9 SHA512 3fc856cdb481a21a39c9874c2170148750968a776d54b43e7f0add51c2f3d4274d8050e04001241401878fa45369063b2e0736b8d84aa6d9f1c939a7b59589df
 DIST wwwoffle-2.9i.tgz 1113771 BLAKE2B 5acf6e14f362fe87d8f91599aaf113ce8ea5a178ed08eb21d4371d0edfc77a5c0a38e8e0053b51cf6426b0b701ba4fbbddfc84240161877a892aa2da303a5ecf SHA512 c9e9d67df9a0e40b584916857221a9a728f36a677cba28527f8c2febea1a23379d3b112d96723bf01ec1718a0897d8980715864ac7ef898b2585dd3f01d9a456
-EBUILD wwwoffle-2.9i-r1.ebuild 3418 BLAKE2B 44db34afd5b4d98fac8e465ad986401402cb47dd7380697eb480a52e18133b43a4b57edc1f5a556a2e6866b79703eba62c21070a187248cac050a58efbfc961e SHA512 a694771a9cf60a2a39fc330a32b551388fed6822db148f00658eabba893a3f05612210d1d3617e92a60ac8667262460b0944e892edeec76576d8d9d951867709
+EBUILD wwwoffle-2.9i-r2.ebuild 3301 BLAKE2B 9ddb027d83887d00d6826090b0334bc31c652bbc279fafd65f94a8c7d8ae029fda9ea15d069112ecdf01948df7f9c35a12a9fd893343f9f8c820170725c31519 SHA512 3f1dd00589393c57f79569a338ac49dac9981e16f9021c2bbe96dc33c81c70c839385484a30192bf6362027e153c9c821539d17edc07760a6206ac5967721ca9
 MISC metadata.xml 411 BLAKE2B e496e1af92583008ac4b5a911875b4ff673a185f40fa11f220dfb4f8cfa48863978831f5d94da2182adc68d41fc7f352d78770492cc13653c6de1da4d2a672df SHA512 5fda409241cb042a9d6fc2e40f1af97a92b75294477b15303d4413ea4a2cf358e52c64ade1dff386afa8582f84e7c7b75034bb95e1032e65de0bf5bf61c50d7e
diff --git a/net-proxy/wwwoffle/wwwoffle-2.9i-r1.ebuild b/net-proxy/wwwoffle/wwwoffle-2.9i-r2.ebuild
index 9ad5008d950c..a9ea1c3fbe98 100644
--- a/net-proxy/wwwoffle/wwwoffle-2.9i-r1.ebuild
+++ b/net-proxy/wwwoffle/wwwoffle-2.9i-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils user
+EAPI=7
 
 DESCRIPTION="Web caching proxy suitable for non-permanent Internet connections"
 HOMEPAGE="https://www.gedanken.org.uk/software/wwwoffle/"
@@ -13,27 +12,34 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="gnutls ipv6 zlib"
 
-RDEPEND="gnutls? ( net-libs/gnutls )
-	zlib? ( sys-libs/zlib )"
-DEPEND="dev-lang/perl
+RDEPEND="
+	acct-group/wwwoffle
+	acct-user/wwwoffle
+	gnutls? ( net-libs/gnutls )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	dev-lang/perl
 	sys-devel/flex
-	${RDEPEND}"
-
+	${RDEPEND}
+"
 # Unsure whether to depend on >=www-misc/htdig-3.1.6-r4 or not
 
+PATCHES=( "${FILESDIR}"/${PN}-2.9i-define.patch )
+
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-2.9i-define.patch
-	sed -i cache/Makefile.in \
-		-e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' \
-		|| die
 	default
+	sed -e 's#$(TAR) xpf #$(TAR) --no-same-owner -xpf #' -i cache/Makefile.in || die
 }
 
 src_configure() {
-	econf \
-		$(use_with gnutls) \
-		$(use_with ipv6) \
+	local myeconfargs=(
+		$(use_with gnutls)
+		$(use_with ipv6)
 		$(use_with zlib)
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -57,30 +63,23 @@ src_install() {
 	done
 
 	# empty dirs are removed during update
-	keepdir \
-		/var/spool/wwwoffle/search/{mnogosearch/db,htdig/tmp,htdig/db-lasttime,htdig/db,namazu/db}
+	keepdir /var/spool/wwwoffle/search/{mnogosearch/db,htdig/tmp,htdig/db-lasttime,htdig/db,namazu/db}
 
-	touch \
-		"${D}/var/spool/wwwoffle/search/htdig/wwwoffle-htdig.log" \
-		"${D}/var/spool/wwwoffle/search/mnogosearch/wwwoffle-mnogosearch.log" \
-		"${D}/var/spool/wwwoffle/search/namazu/wwwoffle-namazu.log"
+	touch "${D}/var/spool/wwwoffle/search/htdig/wwwoffle-htdig.log"
+	touch "${D}/var/spool/wwwoffle/search/mnogosearch/wwwoffle-mnogosearch.log"
+	touch "${D}/var/spool/wwwoffle/search/namazu/wwwoffle-namazu.log"
 
 	# TODO htdig indexing as part of initscripts
 
 	# robots.txt modification - /var/spool/wwwoffle/html/en
-	# 		- remove Disallow: /index
-	sed -i -e "s|Disallow:.*/index|#Disallow: /index|" "${D}/var/spool/wwwoffle/html/en/robots.txt"
+	# - remove Disallow: /index
+	sed -e "s|Disallow:.*/index|#Disallow: /index|" -i "${D}/var/spool/wwwoffle/html/en/robots.txt" || die
 }
 
 pkg_preinst() {
-	# Add a wwwoffle user
-	enewgroup wwwoffle
-	enewuser wwwoffle -1 -1 /var/spool/wwwoffle wwwoffle
-
 	# Changing the user:group to wwwoffle:woffle
 	fowners -R wwwoffle:wwwoffle /var/spool/wwwoffle /etc/wwwoffle
-	sed -i -e 's/^[# \t]\(run-[gu]id[ \t]*=[ \t]*\)[a-zA-Z0-9]*[ \t]*$/ \1wwwoffle/g' \
-		"${D}/etc/wwwoffle/wwwoffle.conf"
+	sed -e 's/^[# \t]\(run-[gu]id[ \t]*=[ \t]*\)[a-zA-Z0-9]*[ \t]*$/ \1wwwoffle/g' -i "${D}/etc/wwwoffle/wwwoffle.conf" || die
 
 }
 
@@ -93,10 +92,8 @@ pkg_postinst() {
 		[ ! -d "${ROOT}/var/spool/wwwoffle/prevout${number}" ] && \
 			keepdir "${ROOT}/var/spool/wwwoffle/prevout${number}"
 	done
-	chown -R wwwoffle:wwwoffle "${ROOT}/var/spool/wwwoffle" "${ROOT}/etc/wwwoffle"
 
-	[ -f "${T}/stopped" ] && \
-		ewarn "wwwoffled was stopped. /etc/init.d/wwwoffled start to restart AFTER etc-update"
+	[ -f "${T}/stopped" ] && ewarn "wwwoffled was stopped. /etc/init.d/wwwoffled start to restart AFTER etc-update"
 
 	einfo "wwwoffled should run as an ordinary user now. The run-uid and run-gid should be set"
 	einfo "to \"wwwoffle\" in your /etc/wwwoffle/wwwoffle.conf. Please uncomment this if it hasn't been already"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /net-proxy
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)