gentoo resync : 28.04.2021

15 files changed, 95 insertions, 443 deletions

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.7.ebuild b/net-proxy/haproxy/haproxy-2.3.7.ebuild
deleted file mode 100644
index b7ea2373967e..000000000000
--- a/net-proxy/haproxy/haproxy-2.3.7.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.8.ebuild b/net-proxy/haproxy/haproxy-2.3.9.ebuild
index b7ea2373967e..463b8b547e69 100644
--- a/net-proxy/haproxy/haproxy-2.3.8.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