gentoo resync : 14.05.2020

3 files changed, 2 insertions, 53 deletions

diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 654aad009f81..315dc7a434c2 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,7 +1,5 @@
 AUX clazy-1.6-clang-cpp.patch 2138 BLAKE2B c51fe27ced22c25f754583ec3b39f92dbc2f68e6ad823802b764dc85385c1f103db6f54fe0fa213386b092dd968e8b70e2fe7cb424b83ce26964ba22a26eac0f SHA512 f916a6a5dc2a25e7dfc3c75ddc9b31d189c7a1b88db8ef3bdd6168e571e03472f099877c1c998917edcc3ccc1e4eb22bac481e95ced9c8efa98aaf9d90f59de7
 AUX clazy-1.6-llvm-10.patch 3309 BLAKE2B e984da005e3ba4a07f55995e569035e52e8f897afc408313f73ea361b49b3a62df779a278cb7dfade7d814016bad3734a24fb0b1c3216f7cf09b8bb21cac01fd SHA512 6f5ef3e745159da352e867be1c3ffecbf143c3763e08dfccb8bd85db1a7676fc84d9577b53d9809d5c29ac3b570278f8e6fa426a11bd38a2706e21b426caa92b
-DIST clazy-1.5.tar.xz 352344 BLAKE2B 0f7200900f1a8bcad3020cf98522e3ac9ba01dddc9b2200f08a8a86102e4389af7a4a86e1832ee4c0e750267948a908627032385a01af94d8d0ae5f438114b9e SHA512 863cb9609d02a2260b61bc6cb3e6d8a84975d3b4e4f1c94a82e8c600d95a28483c323f47ac39c39ecef24d0f51871b358055868c63a49b136cf8ee3060df5a52
 DIST clazy-1.6.tar.xz 364292 BLAKE2B 01da58e34d5a7cb1e812d10264cebe15e90369589535e07f2c9f4520971f2e95b2c70494e99e34f7077957ec1bf01352fa6a72a64f0572e8a5db422267ab727a SHA512 dc7cb9590bbc40a2ac51abe305b6520ebc1ff7128ff21b4f6111d18f14eb8c2ab66d907636a18c7508143b708e70ba69f9d6fad88ffce12dec981a9bdd0edcc0
-EBUILD clazy-1.5-r1.ebuild 1245 BLAKE2B 423002fe1ef029ede892c00fc8819aaf147dc9b9599778a23029b596014f27785f3c02fe61560bbb35f55d3783954f0bd4f8d1a6e22539b2b142d8cfa9acf98a SHA512 fdaba609e73bc2ccaf91d780f703736408dc4fca493f9b8d28fa950345c213867353836b312eb58c954ad048b9f1d760c0b39da799e2373e4293fdff8e38ed1e
-EBUILD clazy-1.6-r1.ebuild 1302 BLAKE2B b1b45ad5116fa3d9617c81b5a239ada8cb508bb691b9b90aa25cf98e5d45e6ff06a67c5d94ee44cd38cab2e64795dc8bb9d0988ec312a544df4949ef39cfc246 SHA512 8ed130e6a5930c1ed58fc8bd6b2e74d36d42c311f758f8a20117e34faee7eeb8135d70351346f90a433e4c29ac76a7fe641c2e8193bbd166af56727b1d3733a9
+EBUILD clazy-1.6-r1.ebuild 1301 BLAKE2B 845831ebf0055616653e1b5a2c83a713bf868e8e2b99536fc6ac164d9f8e600becfe92014b04f46af914f875c8c39253e5b43934aeebc517bc5a3f6205415f85 SHA512 40cd50df692eb339601b28303ed26b8dfef6646a31e468157c6237a9715794f10b8e26f075b74240314381c4071837c459c5181e0c361adde9189282c7c323e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.5-r1.ebuild b/dev-util/clazy/clazy-1.5-r1.ebuild
deleted file mode 100644
index cc5cf804601c..000000000000
--- a/dev-util/clazy/clazy-1.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=7
-
-inherit cmake
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	<sys-devel/clang-10:=
-	>=sys-devel/llvm-3.8:=
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
-		-i CMakeLists.txt || die
-
-	sed -e 's|${MAN_INSTALL_DIR}|share/man/man1|' \
-		-i docs/man/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-10")
-	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
-	rmdir "${D}"/usr/share/doc/clazy || die
-}
diff --git a/dev-util/clazy/clazy-1.6-r1.ebuild b/dev-util/clazy/clazy-1.6-r1.ebuild
index 2627d7b7becb..e463f585e40e 100644
--- a/dev-util/clazy/clazy-1.6-r1.ebuild
+++ b/dev-util/clazy/clazy-1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="