gentoo resync : 15.06.2021

6 files changed, 9 insertions, 5 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 185443f06a6e..9f8634d7e59d 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 0e3e41b0722c..56c4b144c8d2 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -27,6 +27,6 @@ EBUILD haproxy-2.2.9999.ebuild 5341 BLAKE2B 785c444ee4ed1a43ab19be26c4367221a1e6
 EBUILD haproxy-2.3.10.ebuild 5250 BLAKE2B bced61c6fff7d187f486a5fe05b1a376dc98d42123a7cedc5ea748be46d0cafac8561baae81e3f7fd00cdab86e7354051657fb560432fc2ed817f23e5a90aee3 SHA512 ce4b33fb66c6c7584fbbfccebe9d0583c4ec684d0e14eb866130cee02848e3b3a50cd95a2514266e719914e1b3ee315410f55d348fa3b78a616b048791575c16
 EBUILD haproxy-2.3.9.ebuild 5250 BLAKE2B bced61c6fff7d187f486a5fe05b1a376dc98d42123a7cedc5ea748be46d0cafac8561baae81e3f7fd00cdab86e7354051657fb560432fc2ed817f23e5a90aee3 SHA512 ce4b33fb66c6c7584fbbfccebe9d0583c4ec684d0e14eb866130cee02848e3b3a50cd95a2514266e719914e1b3ee315410f55d348fa3b78a616b048791575c16
 EBUILD haproxy-2.3.9999.ebuild 5341 BLAKE2B 785c444ee4ed1a43ab19be26c4367221a1e65cb3c1f28eac5d5776b4f5104180ad1a3496b20197f1a9c340e429e48b4521dcadd9906e231058b9f10946bac12c SHA512 47f6cceb730d9dd460213856ff06d95b46c04689cbc55549c794d50ad1ad1ecec3d244cadafcf5526e4cfa385be0565e14f1503ebf08d0c187b18feec2f6ffd2
-EBUILD haproxy-2.4.0.ebuild 5561 BLAKE2B b5b60a8906ed0284c3f3e14781a03097f02b0d3215fd19b4e1f430b99ca315cbb9d56da93e2797dade7f6c6dccedd5b25067eab01324018949c791095ab78d36 SHA512 316af55a96e2e13c5dbe28f7f409702e43f30bc11123de1ff6c7b2ac7f1c7d2ffb97f7bb465add39a7c241fd36e65a6a755fc6a3667a7b6f6eff5c1f56704d66
-EBUILD haproxy-2.4.9999.ebuild 5561 BLAKE2B b5b60a8906ed0284c3f3e14781a03097f02b0d3215fd19b4e1f430b99ca315cbb9d56da93e2797dade7f6c6dccedd5b25067eab01324018949c791095ab78d36 SHA512 316af55a96e2e13c5dbe28f7f409702e43f30bc11123de1ff6c7b2ac7f1c7d2ffb97f7bb465add39a7c241fd36e65a6a755fc6a3667a7b6f6eff5c1f56704d66
+EBUILD haproxy-2.4.0.ebuild 5560 BLAKE2B cecea7f074f16008081caad02b9b698bd3c15bc29b536a8abebd689f5e1873d1994cc98f33efa2b3dd95a616a4290cd77ab6ccd9512bb61a96fd2ecee0df35a4 SHA512 5a8bc9598a149311da85c716a620869625db1dd01499c18a0f927a54f55c112d7ca871a1c8c9e0f4ed1ef524262b73c0a84eb73018c07cdb856293c41fdc7696
+EBUILD haproxy-2.4.9999.ebuild 5560 BLAKE2B cecea7f074f16008081caad02b9b698bd3c15bc29b536a8abebd689f5e1873d1994cc98f33efa2b3dd95a616a4290cd77ab6ccd9512bb61a96fd2ecee0df35a4 SHA512 5a8bc9598a149311da85c716a620869625db1dd01499c18a0f927a54f55c112d7ca871a1c8c9e0f4ed1ef524262b73c0a84eb73018c07cdb856293c41fdc7696
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-2.4.0.ebuild b/net-proxy/haproxy/haproxy-2.4.0.ebuild
index f7b7893abab1..ec2939f568a0 100644
--- a/net-proxy/haproxy/haproxy-2.4.0.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.0.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax -zlib lua device-atlas 51degrees wurfl"
+ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index f7b7893abab1..ec2939f568a0 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax -zlib lua device-atlas 51degrees wurfl"
+ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 5c3b3342f375..c62e1b36fcad 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 418 BLAKE2B ee8bd518461641a83a67f28ce0e93fe0c2763cda74cddae26ca547010b8a9095982e7ee1339bea9fcbcb248f6a800a1fed63902dd2ac9724e8d6a0d47fbd1f02 SHA512 54594e7813f6618e959f8c52cab5804f9403a8f0afbbdbc3bfadb46899c5d383ec3b9ff28a2721912f1b348f7e6c53a783745b5e0fddaca689c97a0ba9ef83fa
 AUX trojan.initd 981 BLAKE2B 8c021142a6c59dc2fde43bdc75d80c784600583aa997d4bc74539963ec41bdb7a15e57eb7b31ff4ea69e6d3f0034df8bf04fa3f971ca927d306bd9fe12ef9ab5 SHA512 6d419e1c142d8f6c091acb29f0a128742129b7c87f625a7b13e11fdaca6a58c1d2e528cd9ba34658109413735bd6ed8095f16e5eff258ac76f06a727e514793e
 DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf SHA512 60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153
-EBUILD trojan-1.16.0-r2.ebuild 1401 BLAKE2B 21d9c6dd44b740e96589dcad0b66d5cb5bbd0d92d9b8d19eefcc8e4860e1181ed3ceaa34126a11eca86d8093c41a77de01c3e819bc254ec5bc9ab051eab185fa SHA512 720b67a3c3a3b1eb1f599d94399e1f6d88267b949c002dd925f881b754fc180234d6fa30c47b239998b39058f1074c01ce0a2fea84180c4880d283ba54e62234
+EBUILD trojan-1.16.0-r2.ebuild 1455 BLAKE2B c2dd633710c8a7c399dc8338958f205899820e896bfa4aeb8af860bfdb411aa241a3e6916f551671116f217e2db26566ef1d48be107d92b19058ba19a77ca935 SHA512 70d72215474a7273195f226f9d30e457663c3017d3281e5f74cc0ae1ff04fb2ddfeb91f65fafa90329d319da5123296053fd5fc15295dec6e790379f3700d6bc
 MISC metadata.xml 1154 BLAKE2B 1c11e1bfa8e0e6145f64eab2da457caccaf5eb610d2d58afe122bcf108b672264e01d1d69683ecf43a42d0c4dacf59ce82dc128b8f6bab954b6f154bdfc880e4 SHA512 ed2cb5b0305317aae0b1f32a59d0b283b1e2353bec1f5b2b444e1cef6a535f093d23d585c63512fa4f77ae8b734f5d8ddba833aa9b71f6361219bc0b194e8744
diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
index 88eb4b02d0ad..2c5d64a5c9dc 100644
--- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 	test? ( net-misc/curl ${PYTHON_DEPS} )
 "
 
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	cmake_src_prepare