gentoo resync : 25.08.2020

5 files changed, 2 insertions, 194 deletions

diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 5faaaf0e2b25..1ae6ff77bd13 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,8 +1,4 @@
-AUX clazy-1.6-clang-cpp.patch 2138 BLAKE2B c51fe27ced22c25f754583ec3b39f92dbc2f68e6ad823802b764dc85385c1f103db6f54fe0fa213386b092dd968e8b70e2fe7cb424b83ce26964ba22a26eac0f SHA512 f916a6a5dc2a25e7dfc3c75ddc9b31d189c7a1b88db8ef3bdd6168e571e03472f099877c1c998917edcc3ccc1e4eb22bac481e95ced9c8efa98aaf9d90f59de7
-AUX clazy-1.6-llvm-10.patch 3309 BLAKE2B e984da005e3ba4a07f55995e569035e52e8f897afc408313f73ea361b49b3a62df779a278cb7dfade7d814016bad3734a24fb0b1c3216f7cf09b8bb21cac01fd SHA512 6f5ef3e745159da352e867be1c3ffecbf143c3763e08dfccb8bd85db1a7676fc84d9577b53d9809d5c29ac3b570278f8e6fa426a11bd38a2706e21b426caa92b
 AUX clazy-1.7-gnuinstalldirs.patch 3167 BLAKE2B cc4d56ea57c66b7c8bde5eb9a9afbc491f0ee29f91ebab381150838943150fd92ac46dc099833baf8b75cbeb17bcfb790b2a6b7f2a1c0dc964892f9cf9ab76b8 SHA512 08addfc9fc6749e9afcea078c38d31c7f13247887f638d16c9797d4145d5b0fa363721534104fd9f955dd13a175981634b1c54e209019c37ba5da79b33ab6a45
-DIST clazy-1.6.tar.xz 364292 BLAKE2B 01da58e34d5a7cb1e812d10264cebe15e90369589535e07f2c9f4520971f2e95b2c70494e99e34f7077957ec1bf01352fa6a72a64f0572e8a5db422267ab727a SHA512 dc7cb9590bbc40a2ac51abe305b6520ebc1ff7128ff21b4f6111d18f14eb8c2ab66d907636a18c7508143b708e70ba69f9d6fad88ffce12dec981a9bdd0edcc0
 DIST clazy-1.7.tar.xz 371788 BLAKE2B 281acd0164cf76510e46883fff7269aa77e4b815d6d0ca5a54307165ff8f4355e095b82e0c41cdb0af391f4a15048a8d64b2a2a7b9dabc042b36ba1a380405cc SHA512 3dba993140f3d69aac8d9cf3fa49db990185928647193220b689773bbca70f9fd9ee7fc52022e6029b3c0c81800301a593bd79edee7e1fa6c5884782d390ced6
-EBUILD clazy-1.6-r1.ebuild 1310 BLAKE2B 7954c600cbd881a77268c49ed5e0a733e7a98719610a9e6b2f68bc412243825344286b2f91bc876f5c44dc0e2b663ceadf2c430e61bcad5f9d9099674918a0f9 SHA512 9b16f0546a7c1bd9d4faf453d8efe962448d3208e2dade25f736b63d309c835d1e8aaf096d974eccd699aff995d00a7fced95a49b3ab4500e4a271add73deb1e
-EBUILD clazy-1.7.ebuild 1054 BLAKE2B 2fd2dc1a0527e71691eea5a5cfca34a42889542092c5a0973c5d4d33dfb6cadb210537dd41c2ede1c7533561c0ad32be9bc86cf8d90d9b5add54b1f5e500bcf8 SHA512 18eb3379c67e8e699989ec7d82d5ca4031a4fce3b955e2db203196eec96e61038f3ea64e7b384927700e5c3ef48afa8321f353160cf4f9d7723b7a1d7d4ac67a
+EBUILD clazy-1.7.ebuild 1053 BLAKE2B b9196c366dbc8d16fcd4ebeae07cc1a36792def33149b12dd5da3750568879ee09d9b6c12bfbf0e0fe48192e2ee109ac59335dabb156b5e697fda6c12772d859 SHA512 2335f89afed13353d99a8598aa9f653b4c3bd55414711b3825c2df024b1ce2c307315fa763a928aacec8f6310e9557f31c5e4056ffae69c22325acdb686993b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.6-r1.ebuild b/dev-util/clazy/clazy-1.6-r1.ebuild
deleted file mode 100644
index 7db5c3d63669..000000000000
--- a/dev-util/clazy/clazy-1.6-r1.ebuild
+++ /dev/null
@@ -1,53 +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://kde.org/applications/development/org.kde.clazy"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	>=sys-devel/llvm-3.8:=
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-llvm-10.patch"
-	"${FILESDIR}/${P}-clang-cpp.patch"
-)
-
-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")
-	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.7.ebuild b/dev-util/clazy/clazy-1.7.ebuild
index 6d9e004a7686..14f32246c9c7 100644
--- a/dev-util/clazy/clazy-1.7.ebuild
+++ b/dev-util/clazy/clazy-1.7.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="
diff --git a/dev-util/clazy/files/clazy-1.6-clang-cpp.patch b/dev-util/clazy/files/clazy-1.6-clang-cpp.patch
deleted file mode 100644
index 16b9af00ce37..000000000000
--- a/dev-util/clazy/files/clazy-1.6-clang-cpp.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 0e295e5a926496f5a5d46ea4feb1b285b084f5e0 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Mon, 11 Nov 2019 10:31:49 +0100
-Subject: Check if clazy should be linked to clang-cpp
-
-Summary:
-According to [1], clang can now provide a single shared library instead of split
-ones.
-
-We have to check if this library exists and link to it if available.
-
-[1] https://releases.llvm.org/9.0.0/tools/clang/docs/ReleaseNotes.html#build-system-changes
-
-Reviewers: smartins, kde-buildsystem
-
-Reviewed By: smartins
-
-Differential Revision: https://phabricator.kde.org/D25163
----
- CMakeLists.txt        | 11 ++++++++---
- cmake/FindClang.cmake |  1 +
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b7301ed..ce1f887 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -125,9 +125,14 @@ macro(link_to_llvm name is_standalone)
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-   endif()
--    target_link_libraries(${name} clangTooling)
--    target_link_libraries(${name} clangToolingCore)
--    target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-+    # clang >= 9.0 can provide a single shared library instead of split ones
-+    if(CLANG_CLANG-CPP_LIB)
-+        target_link_libraries(${name} clang-cpp)
-+    else()
-+        target_link_libraries(${name} clangTooling)
-+        target_link_libraries(${name} clangToolingCore)
-+        target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-+    endif()
- endmacro()
- 
- macro(add_clang_plugin name)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-index 542172e..50e0829 100644
---- a/cmake/FindClang.cmake
-+++ b/cmake/FindClang.cmake
-@@ -62,6 +62,7 @@ if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
-   # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
-   find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
- 
-+  FIND_AND_ADD_CLANG_LIB(clang-cpp)
-   FIND_AND_ADD_CLANG_LIB(clangFrontend)
-   FIND_AND_ADD_CLANG_LIB(clangDriver)
-   FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--- 
-cgit v1.1
-
diff --git a/dev-util/clazy/files/clazy-1.6-llvm-10.patch b/dev-util/clazy/files/clazy-1.6-llvm-10.patch
deleted file mode 100644
index f00695f52117..000000000000
--- a/dev-util/clazy/files/clazy-1.6-llvm-10.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From df41bd29433937111edca3654a7beb11ec765029 Mon Sep 17 00:00:00 2001
-From: Johannes Ziegenbalg <Johannes.Ziegenbalg@tu-dresden.de>
-Date: Fri, 27 Mar 2020 14:18:32 +0100
-Subject: Fix build issues using llvm 10.0.0
-
----
- CMakeLists.txt                    |  2 +-
- src/ClazyStandaloneMain.cpp       | 10 ++++++++++
- src/checks/level0/qstring-ref.cpp |  4 ++++
- 3 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f1463cf..a30813f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,7 @@ if(MSVC)
-   # disable trigger-happy warnings from Clang/LLVM headers
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244 /wd4291 /wd4800 /wd4141 /wd4146 /wd4251")
- elseif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti")
- endif()
- 
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-flat_namespace -Wl,-undefined -Wl,suppress")
-diff --git a/src/ClazyStandaloneMain.cpp b/src/ClazyStandaloneMain.cpp
-index aada189..6baae32 100644
---- a/src/ClazyStandaloneMain.cpp
-+++ b/src/ClazyStandaloneMain.cpp
-@@ -93,7 +93,11 @@ public:
-     {
-     }
- 
-+#if LLVM_VERSION_MAJOR >= 10
-+    std::unique_ptr<FrontendAction> create() override
-+#else
-     FrontendAction *create() override
-+#endif
-     {
-         ClazyContext::ClazyOptions options = ClazyContext::ClazyOption_None;
- 
-@@ -116,9 +120,15 @@ public:
-             options |= ClazyContext::ClazyOption_IgnoreIncludedFiles;
- 
-         // TODO: We need to agregate the fixes with previous run
-+#if LLVM_VERSION_MAJOR >= 10
-+        return std::make_unique<ClazyStandaloneASTAction>(s_checks.getValue(), s_headerFilter.getValue(),
-+                                                          s_ignoreDirs.getValue(), s_exportFixes.getValue(),
-+                                                          m_paths, options);
-+#else
-         return new ClazyStandaloneASTAction(s_checks.getValue(), s_headerFilter.getValue(),
-                                             s_ignoreDirs.getValue(), s_exportFixes.getValue(),
-                                             m_paths, options);
-+#endif
-     }
-     std::vector<std::string> m_paths;
- };
-diff --git a/src/checks/level0/qstring-ref.cpp b/src/checks/level0/qstring-ref.cpp
-index d1d8a4e..ec9e890 100644
---- a/src/checks/level0/qstring-ref.cpp
-+++ b/src/checks/level0/qstring-ref.cpp
-@@ -117,7 +117,11 @@ static bool containsChild(Stmt *s, Stmt *target)
-         return true;
- 
-     if (auto mte = dyn_cast<MaterializeTemporaryExpr>(s)) {
-+#if LLVM_VERSION_MAJOR >= 10
-+        return containsChild(mte->getSubExpr(), target);
-+#else
-         return containsChild(mte->getTemporary(), target);
-+#endif
-     } else if (auto ice = dyn_cast<ImplicitCastExpr>(s)) {
-         return containsChild(ice->getSubExpr(), target);
-     } else if (auto bte = dyn_cast<CXXBindTemporaryExpr>(s)) {
--- 
-cgit v1.1
-