gentoo resync : 12.03.2021

3 files changed, 2 insertions, 43 deletions

diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 0bcd49c8fe8d..c0be6c9a09dc 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,5 +1,3 @@
-DIST clazy-1.8.tar.xz 392328 BLAKE2B 9ece9d279b2bd7e4c15ad35d9943636a107abd47cf0ed0b20db305b1684610fb84c6f9c7f606f159f0b5a48b881506796f0addf12246f2e9929a08225fcc5c74 SHA512 c43a393721a5235ddcd653f9c322e0a215f86add3b1ce42f849677c108cd21209693c6e8f225171db88032c75596722109ee01bc53db4af90fe7652f27c1eba5
 DIST clazy-1.9.tar.xz 394856 BLAKE2B 641ca46a31475cf7bd03ba921e390cb2712362dc97b960a519e05c47049927f805d3ef6f1c756b96d3483e8f4b75e2dc41a2419a462ed2e45cbd08c88c07f933 SHA512 2e8bec44a027366263de23c50d14192e310fd38fa2b369afb21413da9cb78da9882b2153daf1784c4c9076cc62e2867b5211c75ff9a1eabcb583e405f20f5912
-EBUILD clazy-1.8.ebuild 1000 BLAKE2B 3c6589a1415df7b2fcf463e5c3d396e49b17b583eb4bc756302a9f008f8167f3012634b0bffccc2822532765970409bd6123715d4c36d17614fbedcdbfca35d1 SHA512 764551bdfaef64651d399ea681dc6330aacf0ac425ecc18118f9f820dcfeaafc86c85fb11744f6ab53fee6c58975c448abfcca8c5163dfda48a01d6b11c8e270
-EBUILD clazy-1.9.ebuild 988 BLAKE2B 6e2e73e25b1c45cdb160727183090c573a510d6a265b17d7c17cc35777d9e5ce17773685f33fa3ab5d782471e9fcb602411e38c2493b3ce696ac469f7afd028a SHA512 d93541655d4a0b9850070ef05fc5cd1f0b9bacb38fca1330ae60db9ab5825d7f52bc8fd7cf76c02317ea93a8cf3ad6f7914ad2d915c0c2ff62c1ff49afca8f34
+EBUILD clazy-1.9.ebuild 985 BLAKE2B 7a16ad813d4ccd87ff16bd9d09654fd8721f9120a997eaf1d60ce6dfe021593e35dd3226cf20a1fbe7fb3956a9bde71b429f272be29cea2d2523021cee04ac3e SHA512 a28a5dcb386604a2cc23e7fbbf928ad559446bc2b7895deb80b3140dc1d12d3b45e03b98f78601fdca4474877e165255cf525c0d1dd0858c66f3909e10319f4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.8.ebuild b/dev-util/clazy/clazy-1.8.ebuild
deleted file mode 100644
index 9cba0ac13609..000000000000
--- a/dev-util/clazy/clazy-1.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://apps.kde.org/en/clazy"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=sys-devel/clang-5.0:=
-	>=sys-devel/llvm-5.0:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	# this package requires both llvm and clang of the same version.
-	# clang pulls in the equivalent llvm version, but not vice versa.
-	# so, we must find llvm based on the installed clang version.
-	# bug #681568
-	local clang_version=$(best_version "sys-devel/clang")
-	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-	cmake_src_configure
-}
diff --git a/dev-util/clazy/clazy-1.9.ebuild b/dev-util/clazy/clazy-1.9.ebuild
index e9b6e64599a7..9062383103c4 100644
--- a/dev-util/clazy/clazy-1.9.ebuild
+++ b/dev-util/clazy/clazy-1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="