gentoo resync : 17.07.2021

23 files changed, 133 insertions, 173 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index f14a7d85f97c..caa7eaf5cd82 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 455aa9831670..cdbb029b5898 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-r5.ebuild 2674 BLAKE2B 75c79249b1ab1164b1e140bae35582d84cdea4d40381095f3b13b32222960bae8fd523e8514b6e0505398894dfbe4e740af178c2c9a8c9e36e1fa8e879ff8aaf SHA512 c1acc1cd04f33cf1aaf4977690e49fbcfe3681c38574346af8a6c6933cf8d1dbeed97d1d7f3bb10dab19583987a542422a6f52eb9e411d88eb26c61a1d2b079d
+EBUILD dante-1.4.1-r6.ebuild 2694 BLAKE2B edf168174ddfdf936f54c70f92740e7cf67a134eeff76dcb36f8942c08fca5dedc492eb5e0a62f750a826e984ef978d06932aac5b37d7e62244ca8991cb7c410 SHA512 06b0c07dd52ed64cc7cb4efc490745c062206eaf431ee2e70ef981695de5ea38b0774c82cecc7dd9a7844b2b4b38aba9a2600be10f1f552a7fd71de13cc75d09
 MISC metadata.xml 212 BLAKE2B 3fa0112dac8ca387a2efccd5fcf038abfa26b67a2a512f3eb68491666f2ccb3fd63d1aa63044b0911aa6e5a8e856c762b3120045946afbf256611526d102558e SHA512 81dddbd7e6951957aa574cacaea6594ca44449251e028abd1a34e45e0b32dce1948c815478a65b4ed504364e4dd09f5a2c39d1f7019fc9b827a9ba28f52aca00
diff --git a/net-proxy/dante/dante-1.4.1-r5.ebuild b/net-proxy/dante/dante-1.4.1-r6.ebuild
index 76bd958c87e3..6b433c56f7a1 100644
--- a/net-proxy/dante/dante-1.4.1-r5.ebuild
+++ b/net-proxy/dante/dante-1.4.1-r6.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x8
 IUSE="debug kerberos pam selinux static-libs tcpd upnp"
 
 CDEPEND="
+	virtual/libcrypt:=
 	kerberos? ( virtual/krb5 )
 	pam? ( sys-libs/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 8dcb64c8eddd..2d89e64586c6 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -10,17 +10,17 @@ DIST haproxy-2.3.10.tar.gz 2942240 BLAKE2B 1fecbf3dde98b4839911e3e6437fa01ebf2e8
 DIST haproxy-2.3.12.tar.gz 2950703 BLAKE2B cd3aedaf82bc914d7d62d894187941f64f130b3a9019d5aeba08214f85acd928b7760ce9b5062ffcbc79f8378fa221b6d44b374dac924c33afd5bcc4c3b212ed SHA512 6f5dffaf80d88882848ca6df1fdd68fae17cbf039e311b54f622faa68c36007b827f4f2e71bc1260dd7a395bdc70637a9bac7ea7be414f1971172aaf5f474386
 DIST haproxy-2.4.1.tar.gz 3575591 BLAKE2B ae5d9f12cf2ef8e114f3ec65a3f636c81b3816ea8dd20635ebc2f2e62ed351463ea97f834a166e2d0e8debc168ef23cbe1fab2f4951a2528bb4e02720e59138f SHA512 6251f0ac77b7bceb349a174faff003bbe621490e5380dcdcd06bf712e13e0c94fd08a3651a62e68c862978031ca2fc9ac8432ea4c6062bb1c718db697030de9d
 DIST haproxy-2.4.2.tar.gz 3579220 BLAKE2B fc7f5d0c7ea8be103e74b8a62502c2ffd458ac4f573c7045ec64f66cab127408f5bf088109ac7a2c5f9faeca3580b804dc66b90654122873fe39ba2c01f31217 SHA512 8dc6386e0e0bf7ceed8b6c23ad2d608f6c59777c5ab9731e6bdd13883a31ec5faeee2ceb683589357c028a10c9fbe0a0247baff6825cd5b95e6c82cbe358e4d1
-EBUILD haproxy-1.8.30-r1.ebuild 4837 BLAKE2B 26a5dde732555de4c52f431b434f0da2ac5cd987b78d5e59843733a957ccbc5065cbbf2ead3777a49c5c14c82ee7671bee2346c20275162769fccd483b3a4a0b SHA512 57967a9c823303ec75167266515483d41fdf268efe4ce4758410b410542c58d4e78d9c4ea0e43956422a13882661023ce4d3a0d32148029ab31df02d71d2e3f2
-EBUILD haproxy-2.0.14-r3.ebuild 5374 BLAKE2B 3f78134a9664ea1657504c00b69bb6bbd549cce4a8e7a0937ab5a9106197376a0ecf5c2316a506472d2f69571c9f748afc73f3978c65c4832bc0d7ecbffed352 SHA512 8f8754662639d3cb8f423c72419e6350824be54b6072309d0a76481fc3b8c14b9afe74a8abaf6110a6bae9bd4d3fee5257e65d4215588f80bd7a44a432cc2947
-EBUILD haproxy-2.0.22-r1.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
-EBUILD haproxy-2.0.9999.ebuild 5255 BLAKE2B 8be39d642abc7d83e8dcb644b3d899d432628012786e81b0e318d7be2a661d931c7d8c98e8a737075fc9217078e190ad957de8a7972fd4ea68af7310a0873129 SHA512 d61ec07f2266a999eb7156a180a48e523d5e9b6dec06c28b6ed5de46e7d30283a67b43ac2827acaeb92cc4e40f409973004d8264b60f82feda08a27e759ae999
-EBUILD haproxy-2.2.14-r1.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
-EBUILD haproxy-2.2.5-r2.ebuild 5433 BLAKE2B d950a2af4fb256a93ae8408dc128a3517f53c713a960ff099e31c1e65813fd84aea65754de40af24dd80018d71185b8814750ab8c4c43d7bf5bd1ad8c41d1e1d SHA512 4026e4a4ac7df45ca589de96fb9d29dd01c9ee0f00173b910e53646a21e0e7ce540709499f5f2329efa4f21d4c6ac7c24efd4a304ec5bc22ed0c1d2c9e6fb32b
-EBUILD haproxy-2.2.9999.ebuild 5377 BLAKE2B be7e3f6689e898f9144770ae950fd4e5367ce886cfe3e7188e2f864df23c38c82cae9580463c67ed898e83ffe2a07a5f1cb558259e8a71085d35e53f38c9e8ac SHA512 3074c9c8a8ac72a46776d872254b3f46c99df8d9df8bdf279d4d81670dd5f3a2e32668ff41f5b36d307899feaf40f2aa3942a045052349dc5c0b7eaa7a419b79
-EBUILD haproxy-2.3.10-r1.ebuild 5286 BLAKE2B 3d404dcaedfe5d35d1c7d2c8fa368587667a6cab6ce74200a70e0c6c864af03ec41391fd3b2619be7efb951c4596f85383cf43ad85790fc06065c8ceeffef57e SHA512 36bfc5b7c49567f7f73b1118c63fc267c81b65d221f7340cae02a0c461a60a76e9f5a37fe6b3212959cd4342e084ab2bf7dd7fcdbbeda899c0bfa52cd7216940
-EBUILD haproxy-2.3.12.ebuild 5286 BLAKE2B 3d404dcaedfe5d35d1c7d2c8fa368587667a6cab6ce74200a70e0c6c864af03ec41391fd3b2619be7efb951c4596f85383cf43ad85790fc06065c8ceeffef57e SHA512 36bfc5b7c49567f7f73b1118c63fc267c81b65d221f7340cae02a0c461a60a76e9f5a37fe6b3212959cd4342e084ab2bf7dd7fcdbbeda899c0bfa52cd7216940
-EBUILD haproxy-2.3.9999.ebuild 5286 BLAKE2B 3d404dcaedfe5d35d1c7d2c8fa368587667a6cab6ce74200a70e0c6c864af03ec41391fd3b2619be7efb951c4596f85383cf43ad85790fc06065c8ceeffef57e SHA512 36bfc5b7c49567f7f73b1118c63fc267c81b65d221f7340cae02a0c461a60a76e9f5a37fe6b3212959cd4342e084ab2bf7dd7fcdbbeda899c0bfa52cd7216940
-EBUILD haproxy-2.4.1-r1.ebuild 5596 BLAKE2B dffc5406de3de58636319929e2ffd815a38b8c3dcdf9725de37ff9ce2a49def84d1c2bdf3960570f06ebfd3072f8d653a3688d5bf518d01b581f7e886adc856e SHA512 a1678e0082ecea92def7aa8418e1a5c151c708deadb1b33cc2f6d70a2b58f58b6bae30225ffc9bfd8de48b149eb7e7cea2b50b1d3208a29b20a77b11e5296774
-EBUILD haproxy-2.4.2.ebuild 5596 BLAKE2B dffc5406de3de58636319929e2ffd815a38b8c3dcdf9725de37ff9ce2a49def84d1c2bdf3960570f06ebfd3072f8d653a3688d5bf518d01b581f7e886adc856e SHA512 a1678e0082ecea92def7aa8418e1a5c151c708deadb1b33cc2f6d70a2b58f58b6bae30225ffc9bfd8de48b149eb7e7cea2b50b1d3208a29b20a77b11e5296774
-EBUILD haproxy-2.4.9999.ebuild 5596 BLAKE2B dffc5406de3de58636319929e2ffd815a38b8c3dcdf9725de37ff9ce2a49def84d1c2bdf3960570f06ebfd3072f8d653a3688d5bf518d01b581f7e886adc856e SHA512 a1678e0082ecea92def7aa8418e1a5c151c708deadb1b33cc2f6d70a2b58f58b6bae30225ffc9bfd8de48b149eb7e7cea2b50b1d3208a29b20a77b11e5296774
+EBUILD haproxy-1.8.30-r1.ebuild 4957 BLAKE2B f3e1cbb6527f82f778f3f91ad60325149785a194412744c396e8ff245abd18febc04a0a442fd5f3413efd848d4ba580ba53fe46c74d09857278f3beddbf9391c SHA512 8f93cccad5a28dc83e153381163a2808aa6c0551a87b988823f167610a0dcf4b3b0b6e0bc8a8f5d3645f5ed3dc49e191410c260ddb40d2724cf87c8bdc8c4d56
+EBUILD haproxy-2.0.14-r3.ebuild 5494 BLAKE2B a6efb4609772ffd91f4899f25f2a01ba9f3c78fed7d135390c471f39450abec57d3a6dc1dd9920a47cb594f1dee6961501c9b33888f1f2d468205a84546b1313 SHA512 2b3021e1fbd1de2a6463b923db6d0cdd5300b7fbef481fd908049f002bc904424236722aea066e4eff7d5521043e68275030ac5d19b8f550e5687bd2d7d964e2
+EBUILD haproxy-2.0.22-r1.ebuild 5497 BLAKE2B 6c1b0208a38102c6117501816630c2d2fe98e17476272b329d0deac7727f1088e93e83c1d62d04c8de91057187559729bc73cc47f6a53f747972173448a6d1b3 SHA512 7d5a714596536a4de323c6d4b00e8e7ad07b4e3216aa4b53430746b2475482cfeb587675df723b662ffbb24fa11782bc11ff10715cde2522e3d4017672fbaccc
+EBUILD haproxy-2.0.9999.ebuild 5375 BLAKE2B 1cd0568fef4b2a780e92d9c38ab81824a0b2c58e6c2efb8089e0149fbfd97fcab686f273d725e562ed21708c9e42f155f068ef91ddad182ae5eed19758fcf7f1 SHA512 e3b20b5e12fc5491530958221e1950b341e5a0ec4cc7a987058fb3f7726ab09f3e210a430a17975a556d03bb05c3e1ee12ccf31dedf8e5e938021fa0a2a73aab
+EBUILD haproxy-2.2.14-r1.ebuild 5497 BLAKE2B 6c1b0208a38102c6117501816630c2d2fe98e17476272b329d0deac7727f1088e93e83c1d62d04c8de91057187559729bc73cc47f6a53f747972173448a6d1b3 SHA512 7d5a714596536a4de323c6d4b00e8e7ad07b4e3216aa4b53430746b2475482cfeb587675df723b662ffbb24fa11782bc11ff10715cde2522e3d4017672fbaccc
+EBUILD haproxy-2.2.5-r2.ebuild 5553 BLAKE2B 13e8bffe7cb811a922a8ee942661d6dae2feea11620ca4e9053b466e62de1289a21d22cff68f6c0c9859d8b60a4d4048f230774ec1b88a998c95fb7f0656072f SHA512 a1262be1df48b4fc3c90cc978465bf748b3f2fda92be922c4cf399c463d74454ebca2f2d75cb3c8ba46871659f9cb9626b8cd3393f54d706e17f7cc65ae89022
+EBUILD haproxy-2.2.9999.ebuild 5497 BLAKE2B 6c1b0208a38102c6117501816630c2d2fe98e17476272b329d0deac7727f1088e93e83c1d62d04c8de91057187559729bc73cc47f6a53f747972173448a6d1b3 SHA512 7d5a714596536a4de323c6d4b00e8e7ad07b4e3216aa4b53430746b2475482cfeb587675df723b662ffbb24fa11782bc11ff10715cde2522e3d4017672fbaccc
+EBUILD haproxy-2.3.10-r1.ebuild 5406 BLAKE2B 16fc3419b214b36b1549dfbb381d765fe2b6928b9e59c8a70e92f1bed201b318d886d968794a17f5d9e6b0b2b313c34fc3c251ec58997adaac73b94f7b044ab0 SHA512 d8a82e34b9da85c0450363e595a7c0a3cc198de910ed6c2f2619550611e6944e8075a9a93a32b344b0055fd2792ac3c7a7ed6d434eb3661fcff025ccaa3a7383
+EBUILD haproxy-2.3.12.ebuild 5406 BLAKE2B 16fc3419b214b36b1549dfbb381d765fe2b6928b9e59c8a70e92f1bed201b318d886d968794a17f5d9e6b0b2b313c34fc3c251ec58997adaac73b94f7b044ab0 SHA512 d8a82e34b9da85c0450363e595a7c0a3cc198de910ed6c2f2619550611e6944e8075a9a93a32b344b0055fd2792ac3c7a7ed6d434eb3661fcff025ccaa3a7383
+EBUILD haproxy-2.3.9999.ebuild 5406 BLAKE2B 16fc3419b214b36b1549dfbb381d765fe2b6928b9e59c8a70e92f1bed201b318d886d968794a17f5d9e6b0b2b313c34fc3c251ec58997adaac73b94f7b044ab0 SHA512 d8a82e34b9da85c0450363e595a7c0a3cc198de910ed6c2f2619550611e6944e8075a9a93a32b344b0055fd2792ac3c7a7ed6d434eb3661fcff025ccaa3a7383
+EBUILD haproxy-2.4.1-r1.ebuild 5716 BLAKE2B 393dfa2861333ddec855ca6f606276da1b95e0b12d1832317e3126351db5fb13910da014839c310d5ecda8fdf5a850f5b53aa9fd5f38365e9bc94f57586ce0d0 SHA512 711d1321262ee4c7d395d95de2a2db6ed34e47d599259fa8562546e20c9ce3d7ed82789aa5a79cbb790891ab4732f0df9f229ff7db34b7b2233c33b14ac020b3
+EBUILD haproxy-2.4.2.ebuild 5716 BLAKE2B 393dfa2861333ddec855ca6f606276da1b95e0b12d1832317e3126351db5fb13910da014839c310d5ecda8fdf5a850f5b53aa9fd5f38365e9bc94f57586ce0d0 SHA512 711d1321262ee4c7d395d95de2a2db6ed34e47d599259fa8562546e20c9ce3d7ed82789aa5a79cbb790891ab4732f0df9f229ff7db34b7b2233c33b14ac020b3
+EBUILD haproxy-2.4.9999.ebuild 5716 BLAKE2B 393dfa2861333ddec855ca6f606276da1b95e0b12d1832317e3126351db5fb13910da014839c310d5ecda8fdf5a850f5b53aa9fd5f38365e9bc94f57586ce0d0 SHA512 711d1321262ee4c7d395d95de2a2db6ed34e47d599259fa8562546e20c9ce3d7ed82789aa5a79cbb790891ab4732f0df9f229ff7db34b7b2233c33b14ac020b3
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
index 90d010744750..e6b1932baf9b 100644
--- a/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
index 49cfe55e3a3f..68db0dd89896 100644
--- a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
index 42c17e31be40..6335de9e4750 100644
--- a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index 0dd6f7085108..41c1558bb74b 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	systemd? ( sys-apps/systemd )
 	slz? ( dev-libs/libslz:= )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
index 42c17e31be40..6335de9e4750 100644
--- a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
index f773d9548c6c..5ef90b045a36 100644
--- a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -67,6 +71,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 42c17e31be40..6335de9e4750 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
index 143c6394abda..56c62e7ad7df 100644
--- a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.3.12.ebuild b/net-proxy/haproxy/haproxy-2.3.12.ebuild
index 143c6394abda..56c62e7ad7df 100644
--- a/net-proxy/haproxy/haproxy-2.3.12.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.12.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
index 143c6394abda..56c62e7ad7df 100644
--- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -44,7 +48,7 @@ DEPEND="
 	slz? ( dev-libs/libslz:= )
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -66,6 +70,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
index 31171c86ed5b..9183ede9a103 100644
--- a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -43,7 +47,7 @@ DEPEND="
 	)
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -61,6 +65,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.4.2.ebuild b/net-proxy/haproxy/haproxy-2.4.2.ebuild
index 31171c86ed5b..9183ede9a103 100644
--- a/net-proxy/haproxy/haproxy-2.4.2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.2.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -43,7 +47,7 @@ DEPEND="
 	)
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -61,6 +65,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 31171c86ed5b..9183ede9a103 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI="7"
 
+LUA_COMPAT=( lua5-3 )
+
 [[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
 	device-atlas? ( pcre )
 	?? ( slz zlib )"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
 	crypt? ( virtual/libcrypt:= )
 	pcre? (
@@ -43,7 +47,7 @@ DEPEND="
 	)
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
+	lua? ( ${LUA_DEPS} )
 	device-atlas? ( dev-libs/device-atlas-api-c )"
 RDEPEND="${DEPEND}
 	acct-group/haproxy
@@ -61,6 +65,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	if use net_ns; then
 		CONFIG_CHECK="~NET_NS"
 		linux-info_pkg_setup
diff --git a/net-proxy/redsocks/Manifest b/net-proxy/redsocks/Manifest
index c3b182c37d09..8935f83e3443 100644
--- a/net-proxy/redsocks/Manifest
+++ b/net-proxy/redsocks/Manifest
@@ -1,9 +1,7 @@
 AUX redsocks.conf 350 BLAKE2B 52bf1cb52f94d7eb2ab151905fb8b66644868c9cfb72b1d73951b0442bb300062f5c7b7776f80d1c74733a3980f73aecbc75b1b7364c5dc0bccc9d324b5504d5 SHA512 c6ce0622a54fafef31f40ed01b210c5ffb9af0504303fc5d2a4fb335ac3617fc7832c16b0885471e6f1eea168a0e4aa490089a00fd28e26ce0f9b59db0ac238b
-AUX redsocks.init 1282 BLAKE2B 1efeb84d25630df8501b53d36f056a62733ab2f1c40a591d1c2b321224e3ed526fae1a0cbb4502c233c66b2c7c0541c0893311b749fb486176b978d79b10097b SHA512 81af76d7917273028cda3fa62e2c04ae27f763d93c6abac12c9b47877ae64918b4b07ed680fefb0e11ac3476c3f490f5e6d315ba8b0cf9a40b756cd32fc5234c
-AUX redsocks.init-r1 926 BLAKE2B b167e64335e45806c2791e72667f984f7b9ffb23d2be6c38bc4575d8487320eeb8ae270c0940fc4c198d7064323f3ba561c6954657fb4015a62f30d00ae06274 SHA512 c8c52571fd167d9ca6bb75e5b44741e87f5c57b6752b16026691a71a932cfa55ed43d186cd9d662997020faf370ce3e797ccc555e641149d5f5f8e43bb94901c
+AUX redsocks.init-r2 983 BLAKE2B 66e08407136d5c57d93ef4523a0f8d04dbd6a0213b0455c602e39a06df5b80341d8b6eaea24df5bafaa2d9e8c1d60a93095cecd0d21c971b46dc56aa36f15013 SHA512 f3eb3a99bf5687395b3a3460455db49f9a8c720735c0f96204b8e3bfab232f2e9c3824f360b363675d8997cdfbbece8cd94c80c5fa3365752f22c5d3b0e97488
 AUX redsocks.service 437 BLAKE2B 919055f6cd25a605b3cff1ad63e69579975868952ef362ddf6f025404a0109e159af51854ef3d24663322f1515508b2dfe89b00bc53070a63d515b3bcd0858a8 SHA512 73d2b6df7d1688b2605ec56f1843de1b58a5e3d8e88267cd99aa774303f8184ff5c7756b4fdd7215e3ccba8637eb8e41dac121fbe0339730fa1e51943957ce27
 DIST redsocks-0.5.tar.gz 496403 BLAKE2B 7416340a7142669c72a8aeebc2c0775a393781de7fcbb63e4fbc71ce828658bc2b0615b394a990683c9fd13f41f050c92609dd956b4468bb06ec1ff261324c23 SHA512 678faca95b3570f793754abfe752b3d3580ea125aac8615ca2a1fce92cd50e7919832afe7cf5d1cc40b700045fca08f86ea1697d062ac8e7be706d166e69ff70
-EBUILD redsocks-0.5-r1.ebuild 1130 BLAKE2B 4f67d7a965df21a88953fb1150b702fffe6ec31c3512bd967a7cdac4abe063fc8242ba6df9a14eda38c7e8dcae11589c0a5ac2b9411b60f261782a5007a8501a SHA512 49a61fb4abf69bcf23fb34d95143052430d19a4a65dc469aafcd3354a5de7428fc07b9878b22acc89ce67d4d582cf19828ce6475995c077cfb2af71f1902a179
-EBUILD redsocks-0.5.ebuild 1130 BLAKE2B 3fb70113213f328699d3a3649d4453c74e252ef7c20bc377587b0b21ae099df730aa8e922d265ca71368bf4ad6b89ebd0080128d58da9167895da32b886c0619 SHA512 c832d72a0858e49c70807c825518c5d4bd68a689234f2087ad37aca39f26130498d2753b059651f39f7897be4cb41a589e8ee4e0a66c1c1df318a975e2ec7bc7
-EBUILD redsocks-9999.ebuild 1130 BLAKE2B 3fb70113213f328699d3a3649d4453c74e252ef7c20bc377587b0b21ae099df730aa8e922d265ca71368bf4ad6b89ebd0080128d58da9167895da32b886c0619 SHA512 c832d72a0858e49c70807c825518c5d4bd68a689234f2087ad37aca39f26130498d2753b059651f39f7897be4cb41a589e8ee4e0a66c1c1df318a975e2ec7bc7
+EBUILD redsocks-0.5-r2.ebuild 1060 BLAKE2B c8c52c9be1ae3f1d0ef6cf063ad668a9f6d793cbb25861a6a23978c26482ec10d47f97ffeb2ed2d432a314be24f00dfe10a954c176e03617ea4f794828152946 SHA512 0878adddcd6e1e117e4faaa50d9f540639d9aa96807035c5a88cabe605350e33e9bb96b94640a284c39c1f57ddf71aa02713d3f3e4eeb0991e387ed0d97986d5
+EBUILD redsocks-9999.ebuild 1060 BLAKE2B c8c52c9be1ae3f1d0ef6cf063ad668a9f6d793cbb25861a6a23978c26482ec10d47f97ffeb2ed2d432a314be24f00dfe10a954c176e03617ea4f794828152946 SHA512 0878adddcd6e1e117e4faaa50d9f540639d9aa96807035c5a88cabe605350e33e9bb96b94640a284c39c1f57ddf71aa02713d3f3e4eeb0991e387ed0d97986d5
 MISC metadata.xml 1060 BLAKE2B b7db194e1155a93ff22b6ca713a442ae08f21ae27f9835e0f3ec09ccf86d4f33fa2d4da20251c58acdbeeeaa6bef3fe95de7e22f67eae2acf28406f53e494569 SHA512 5b48446a0edf223af4775df8ebf02b71112cbda5494853e97c0dfaa7aaeecc2529af8c340ab36507c96eaaade07e6ac73bcf51d23acc4a5ddaaf69bbe093a321
diff --git a/net-proxy/redsocks/files/redsocks.init b/net-proxy/redsocks/files/redsocks.init
deleted file mode 100644
index 853d9b57a6bb..000000000000
--- a/net-proxy/redsocks/files/redsocks.init
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${REDSOCKS_BINARY:=/usr/sbin/redsocks}
-: ${REDSOCKS_CONFIG:=/etc/redsocks.conf}
-: ${REDSOCKS_PIDFILE:=/run/redsocks/redsocks.pid}
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f "${REDSOCKS_CONFIG}" ] ; then
-		eerror "No ${REDSOCKS_CONFIG} file exists!"
-		return 1
-	fi
-
-        "${REDSOCKS_BINARY}" -t -c ${REDSOCKS_CONFIG} || return 1
-}
-
-start() {
-        checkconfig || return 1
-
-        ebegin "Starting ${SVCNAME}"
-        start-stop-daemon --start --exec "${REDSOCKS_BINARY}" \
-            -p "${REDSOCKS_PIDFILE}" -c ${REDSOCKS_CONFIG}
-        eend $?
-}
-
-stop() {
-        if [ "${RC_CMD}" = "restart" ] ; then
-                checkconfig || return 1
-        fi
-
-        ebegin "Stopping ${SVCNAME}"
-        start-stop-daemon --stop --exec "${REDSOCKS_BINARY}" \
-            -p "${REDSOCKS_PIDFILE}" -c "${REDSOCKS_CONFIG}"
-        eend $?
-}
-
-reload() {
-        checkconfig || return 1
-
-        ebegin "Reloading ${SVCNAME}"
-        start-stop-daemon --signal HUP --exec "${REDSOCKS_BINARY}" \
-	    -p "${REDSOCKS_PIDFILE}" -c "${REDSOCKS_CONFIG}"
-        eend $?
-}
diff --git a/net-proxy/redsocks/files/redsocks.init-r1 b/net-proxy/redsocks/files/redsocks.init-r2
index 861054fc914a..8ea9998a5da3 100644
--- a/net-proxy/redsocks/files/redsocks.init-r1
+++ b/net-proxy/redsocks/files/redsocks.init-r2
@@ -22,6 +22,8 @@ checkconfig() {
 	fi
 
         "${command}" -t -c ${REDSOCKS_CONFIG} || return 1
+
+	checkpath -d -o "redsocks:redsocks" -q "/run/redsocks"
 }
 
 start_pre() {
diff --git a/net-proxy/redsocks/redsocks-0.5-r1.ebuild b/net-proxy/redsocks/redsocks-0.5-r1.ebuild
deleted file mode 100644
index 665f5a700021..000000000000
--- a/net-proxy/redsocks/redsocks-0.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/darkk/${PN}.git"
-fi
-
-inherit systemd toolchain-funcs user ${GIT_ECLASS}
-
-DESCRIPTION="Transparent redirector of any TCP connection to proxy"
-HOMEPAGE="http://darkk.net.ru/redsocks/"
-LICENSE="Apache-2.0 LGPL-2.1+ ZLIB"
-SLOT="0"
-IUSE="doc"
-RESTRICT="test"
-
-DEPEND="dev-libs/libevent:0="
-RDEPEND="${DEPEND}
-	net-firewall/iptables"
-
-[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}"
-
-pkg_setup() {
-	enewgroup redsocks
-	enewuser redsocks -1 -1 /run/redsocks redsocks
-}
-
-src_compile() {
-	CC="$(tc-getCC)" emake
-}
-
-src_install() {
-	dosbin redsocks
-	doman debian/redsocks.8
-	use doc && dodoc README doc/*
-	insinto /etc
-	newins debian/redsocks.conf redsocks.conf
-
-	newinitd "${FILESDIR}"/redsocks.init-r1 redsocks
-	newconfd "${FILESDIR}"/redsocks.conf redsocks
-
-	systemd_dounit "${FILESDIR}"/redsocks.service
-}
diff --git a/net-proxy/redsocks/redsocks-0.5.ebuild b/net-proxy/redsocks/redsocks-0.5-r2.ebuild
index 187dcecd68ad..5a182c79906f 100644
--- a/net-proxy/redsocks/redsocks-0.5.ebuild
+++ b/net-proxy/redsocks/redsocks-0.5-r2.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/"${PN}"-release-"${PV}"
 	KEYWORDS="~amd64 ~x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/darkk/${PN}.git"
 fi
 
-inherit systemd toolchain-funcs user ${GIT_ECLASS}
+inherit systemd toolchain-funcs ${GIT_ECLASS}
 
 DESCRIPTION="Transparent redirector of any TCP connection to proxy"
 HOMEPAGE="http://darkk.net.ru/redsocks/"
@@ -21,15 +22,12 @@ IUSE="doc"
 RESTRICT="test"
 
 DEPEND="dev-libs/libevent:0="
-RDEPEND="${DEPEND}
-	net-firewall/iptables"
-
-[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}"
-
-pkg_setup() {
-	enewgroup redsocks
-	enewuser redsocks -1 -1 /run/redsocks redsocks
-}
+RDEPEND="
+	${DEPEND}
+	acct-group/redsocks
+	acct-user/redsocks
+	net-firewall/iptables
+"
 
 src_compile() {
 	CC="$(tc-getCC)" emake
@@ -42,7 +40,7 @@ src_install() {
 	insinto /etc
 	newins debian/redsocks.conf redsocks.conf
 
-	newinitd "${FILESDIR}"/redsocks.init redsocks
+	newinitd "${FILESDIR}"/redsocks.init-r2 redsocks
 	newconfd "${FILESDIR}"/redsocks.conf redsocks
 
 	systemd_dounit "${FILESDIR}"/redsocks.service
diff --git a/net-proxy/redsocks/redsocks-9999.ebuild b/net-proxy/redsocks/redsocks-9999.ebuild
index 187dcecd68ad..5a182c79906f 100644
--- a/net-proxy/redsocks/redsocks-9999.ebuild
+++ b/net-proxy/redsocks/redsocks-9999.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/"${PN}"-release-"${PV}"
 	KEYWORDS="~amd64 ~x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/darkk/${PN}.git"
 fi
 
-inherit systemd toolchain-funcs user ${GIT_ECLASS}
+inherit systemd toolchain-funcs ${GIT_ECLASS}
 
 DESCRIPTION="Transparent redirector of any TCP connection to proxy"
 HOMEPAGE="http://darkk.net.ru/redsocks/"
@@ -21,15 +22,12 @@ IUSE="doc"
 RESTRICT="test"
 
 DEPEND="dev-libs/libevent:0="
-RDEPEND="${DEPEND}
-	net-firewall/iptables"
-
-[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}"
-
-pkg_setup() {
-	enewgroup redsocks
-	enewuser redsocks -1 -1 /run/redsocks redsocks
-}
+RDEPEND="
+	${DEPEND}
+	acct-group/redsocks
+	acct-user/redsocks
+	net-firewall/iptables
+"
 
 src_compile() {
 	CC="$(tc-getCC)" emake
@@ -42,7 +40,7 @@ src_install() {
 	insinto /etc
 	newins debian/redsocks.conf redsocks.conf
 
-	newinitd "${FILESDIR}"/redsocks.init redsocks
+	newinitd "${FILESDIR}"/redsocks.init-r2 redsocks
 	newconfd "${FILESDIR}"/redsocks.conf redsocks
 
 	systemd_dounit "${FILESDIR}"/redsocks.service