gentoo auto-resync : 14:09:2022 - 11:10:10

4 files changed, 21 insertions, 9 deletions

diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 33b119a1e66e..0eb6699233d4 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -17,7 +17,7 @@ DIST nftables-1.0.4.tar.bz2.sig 566 BLAKE2B 1ac42a2eb678abcc21d01bbaf5f9a3af3f4c
 DIST nftables-1.0.5.tar.bz2 982538 BLAKE2B 5d58170b8fc6feccc1581653cd0815d37b59b43b7f4f9bff9f7fb46928c6c7eee5a6f07150c404f7cf42f5a1d2e980860a4dd2589b99773179e019a093c42cfa SHA512 51cbf10579db7eed58f4358044840f2ce1bffe84533c5fb03e0ebcc702970856455576ac793169c94d38a9f8148e33631ad91444e54a8be189d93af7c27feb9a
 DIST nftables-1.0.5.tar.bz2.sig 566 BLAKE2B 7744a84c213999b35c3094fa5d9f974acec6fedac3d310422834285823825bcb14fb55b463d88b91fa41d79e33ce34498769992d912b7178fa1f70bd7a1e0977 SHA512 fbff6b5b28d81e964d4523729c7866d0b52d764d090cae70a43d850bc579b17308ec41a3d7fe6707877850028e99ad09c33b5e87fa16ac5199dfeba193a61511
 EBUILD nftables-1.0.2-r1.ebuild 5163 BLAKE2B 02bacad62aea322b42251fb73ea3e23e061167ae5bde03f751231db9b33f3d85cb8a8b0b28038140264092c2a1776e0a4c9b0a464775a0e30c57cc988ac09a36 SHA512 2b55eb2c17686e13ddde19d4da06d0ac1efe09500fd62cc205fcf95d9977f7d2478369aec51e2455aed69c49869afcc54badd08bc3c4bcf26d58972d095c8aa8
-EBUILD nftables-1.0.4-r2.ebuild 5968 BLAKE2B 0f8ce138611670ceb91e919eedc02456c50b3b0850048f6efd8e2c59eacc2c84804cbede6008f20eb03e8a95bf1ecffc7867174f21f1eb8dd276614e9ef97e7c SHA512 ef0be83522efbce508ddb19d6acf7a162d049e5ac15a8e20f3e7ef736d0c7a0512962166b533067dc1c43af48f0d26451973703eb4a70d8b441b4457ce6f101a
-EBUILD nftables-1.0.5.ebuild 5877 BLAKE2B 772a44595ae0e3235edeb92f95496f08c9d0c7f4dc8c03355c9d2b73a882caba148b8eac4c894841b45aa49b4017b5cf2b6f95a545158e64324ef7042a251a69 SHA512 b0ce3867afdc7e1c65ef305ea2500392bf99352075caa80ec73e2555fc5c6af24fc3150283882d175d629a3ccd1af6002645cf2670834faf5c9d10ccf135712f
-EBUILD nftables-9999.ebuild 5877 BLAKE2B 772a44595ae0e3235edeb92f95496f08c9d0c7f4dc8c03355c9d2b73a882caba148b8eac4c894841b45aa49b4017b5cf2b6f95a545158e64324ef7042a251a69 SHA512 b0ce3867afdc7e1c65ef305ea2500392bf99352075caa80ec73e2555fc5c6af24fc3150283882d175d629a3ccd1af6002645cf2670834faf5c9d10ccf135712f
+EBUILD nftables-1.0.4-r2.ebuild 6036 BLAKE2B b6e8e4495760fa8c3cad289c72a6c371fcfd248db20d420f67f2ebd64e3e091c6fc1d3390e2ec15c93d94b287477ebc521473c24d4a8e8a3b1df2f086de02141 SHA512 ba9274f4751d3c9706705ecddbb9e58f48b2d0cd8f0c4a5bd446b32d022799f27f33411820fe618fb6fd5618196962e06320ebe6c73e5393550b0cbdca8a6000
+EBUILD nftables-1.0.5.ebuild 5945 BLAKE2B 8ea7e7df9c30eb528886a4d85cc0bf83a772b6981827a8793f4bc4f9a69641014f0bea944bd71ac57a154fef4fc68635306a0d774388d1da9009fd86f165e010 SHA512 43096cee331905decbec8f79d91d76da0139131e8cbf59a40da928a7d68f6a3097388cdca6aa570b90df3e56af5cf91e3df046e03dad51913e1f70385d197cf7
+EBUILD nftables-9999.ebuild 5945 BLAKE2B 8ea7e7df9c30eb528886a4d85cc0bf83a772b6981827a8793f4bc4f9a69641014f0bea944bd71ac57a154fef4fc68635306a0d774388d1da9009fd86f165e010 SHA512 43096cee331905decbec8f79d91d76da0139131e8cbf59a40da928a7d68f6a3097388cdca6aa570b90df3e56af5cf91e3df046e03dad51913e1f70385d197cf7
 MISC metadata.xml 933 BLAKE2B 8e76ce489c41dcc01e222d77af40f2ba5cb7ddffc2bc818c6fc8c16e24dc308c125ce4d78db1647e77af96f32c85dd3391f7079e2cee26c129c56557e0c48c8a SHA512 058d38df1dbb2c1d0e611bd992f37498d3977561c3b34846fdf0d569573f2ef93a29a216ab491e583cfc2399c55c839d256dfcf8b1d7aaba63ed6ea90f22df25
diff --git a/net-firewall/nftables/nftables-1.0.4-r2.ebuild b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
index 0da0a19b311e..a1e256654082 100644
--- a/net-firewall/nftables/nftables-1.0.4-r2.ebuild
+++ b/net-firewall/nftables/nftables-1.0.4-r2.ebuild
@@ -29,7 +29,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0/1"
 IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs test xtables"
-RESTRICT="test? ( userpriv ) !test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.4:0=
@@ -123,7 +123,11 @@ src_compile() {
 src_test() {
 	emake check
 
-	edo tests/shell/run-tests.sh -v
+	if [[ ${EUID} == 0 ]]; then
+		edo tests/shell/run-tests.sh -v
+	else
+		ewarn "Skipping shell tests (requires root)"
+	fi
 
 	# Need to rig up Python eclass if using this, but it doesn't seem to work
 	# for me anyway.
diff --git a/net-firewall/nftables/nftables-1.0.5.ebuild b/net-firewall/nftables/nftables-1.0.5.ebuild
index 24d357de9872..b6fdb61bd493 100644
--- a/net-firewall/nftables/nftables-1.0.5.ebuild
+++ b/net-firewall/nftables/nftables-1.0.5.ebuild
@@ -29,7 +29,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0/1"
 IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs test xtables"
-RESTRICT="test? ( userpriv ) !test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.4:0=
@@ -120,7 +120,11 @@ src_compile() {
 src_test() {
 	emake check
 
-	edo tests/shell/run-tests.sh -v
+	if [[ ${EUID} == 0 ]]; then
+		edo tests/shell/run-tests.sh -v
+	else
+		ewarn "Skipping shell tests (requires root)"
+	fi
 
 	# Need to rig up Python eclass if using this, but it doesn't seem to work
 	# for me anyway.
diff --git a/net-firewall/nftables/nftables-9999.ebuild b/net-firewall/nftables/nftables-9999.ebuild
index 24d357de9872..b6fdb61bd493 100644
--- a/net-firewall/nftables/nftables-9999.ebuild
+++ b/net-firewall/nftables/nftables-9999.ebuild
@@ -29,7 +29,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0/1"
 IUSE="debug doc +gmp json libedit +modern-kernel python +readline static-libs test xtables"
-RESTRICT="test? ( userpriv ) !test? ( test )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=net-libs/libmnl-1.0.4:0=
@@ -120,7 +120,11 @@ src_compile() {
 src_test() {
 	emake check
 
-	edo tests/shell/run-tests.sh -v
+	if [[ ${EUID} == 0 ]]; then
+		edo tests/shell/run-tests.sh -v
+	else
+		ewarn "Skipping shell tests (requires root)"
+	fi
 
 	# Need to rig up Python eclass if using this, but it doesn't seem to work
 	# for me anyway.