gentoo resync : 08.10.2021

4 files changed, 5 insertions, 79 deletions

diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index 84900754ba18..5a2d06fea695 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,7 +1,3 @@
-DIST clippy-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
 DIST clippy-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
-DIST clippy-8.0.tar.gz 8195258 BLAKE2B 75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97 SHA512 fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a
-EBUILD clippy-7.5.1.ebuild 693 BLAKE2B 8f25cab95ebdeae3d04fa3d20ef2a26fb6cd3084e0789a2056b62213239b34494e077125eeb1b2125abbac4f365400be984c04959c1e2a82c77552827ac7282f SHA512 ea6c83082e703656eda9b00f746852e013ab7ddf0db9a57b5da5cc9db4f03badb2900e9dc4707f649f902400066be39d9512386c322dbbf222c73fa9216c8c98
-EBUILD clippy-8.0-r1.ebuild 714 BLAKE2B 9cc4ed111762f760c54d498bef0043316637b0b32dd91121c622dc2d07fac470520047bcd40e8e154cf7af7b55e6b0ba9fdab42b36679ac6e68505d507a6a099 SHA512 4143b7b0def8ee431f4a36c96c88ae669900100d5dc622c4f3cc9cca3396900d1a0b642582865716e9fb8708debd1ff046ba469a5c0ac8200c485d8ba26948c1
-EBUILD clippy-8.0.1.ebuild 714 BLAKE2B 9cc4ed111762f760c54d498bef0043316637b0b32dd91121c622dc2d07fac470520047bcd40e8e154cf7af7b55e6b0ba9fdab42b36679ac6e68505d507a6a099 SHA512 4143b7b0def8ee431f4a36c96c88ae669900100d5dc622c4f3cc9cca3396900d1a0b642582865716e9fb8708debd1ff046ba469a5c0ac8200c485d8ba26948c1
+EBUILD clippy-8.0.1.ebuild 808 BLAKE2B be962344e52a02f9afa7f360d93b28527c4634f3ff0c3045fe04fd17dab721575b07a6b8b64c0843ddae6742a04ef8b50c35723e2d451b1b1fd367c48804fd78 SHA512 9f0e779fcf28a8516a760a5027584f522e9a1513a5ff492b4a16116158ba7fa786c707aa90bd763a5448f67fd1d1c54b60edf8ffd202b29ff1b707c985eb7e90
 MISC metadata.xml 326 BLAKE2B b909c2525951476b2905e143974e734364023b9ac622f01ddae1e16427359ea47af02af11a3bb6ac5c51ef519c9c66995c8cba31d9ca41f1e48f33106a0678b3 SHA512 ee570ffd0054e2c132d637b41921bb25f3172fdfb0bcbc5d2214eaa3bb95c109ca58a5e6cd7ebd386de497ef3e20cf3696243dcc5e82fc4cfae25bba51be4db9
diff --git a/dev-util/clippy/clippy-7.5.1.ebuild b/dev-util/clippy/clippy-7.5.1.ebuild
deleted file mode 100644
index 3ac21b928377..000000000000
--- a/dev-util/clippy/clippy-7.5.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="frr-${PV}"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Standalone clippy tool built from FRR sources"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
-
-S="${WORKDIR}/frr-${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-clippy-only
-}
-
-src_install() {
-	dobin lib/clippy
-}
diff --git a/dev-util/clippy/clippy-8.0-r1.ebuild b/dev-util/clippy/clippy-8.0-r1.ebuild
deleted file mode 100644
index 43689631b4e9..000000000000
--- a/dev-util/clippy/clippy-8.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="frr-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Standalone clippy tool built from FRR sources"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/frr-${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	virtual/libelf:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-clippy-only
-}
-
-src_install() {
-	dobin lib/clippy
-}
diff --git a/dev-util/clippy/clippy-8.0.1.ebuild b/dev-util/clippy/clippy-8.0.1.ebuild
index 43689631b4e9..9fefa0ae3fc6 100644
--- a/dev-util/clippy/clippy-8.0.1.ebuild
+++ b/dev-util/clippy/clippy-8.0.1.ebuild
@@ -17,6 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# standalone clippy does not have any tests
+# restrict to prevent bug 811753
+RESTRICT="test"
+
 DEPEND="
 	${PYTHON_DEPS}
 	virtual/libelf:=