gentoo resync : 04.07.2020

3 files changed, 125 insertions, 0 deletions

diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index bde7142231e5..5faaaf0e2b25 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,5 +1,8 @@
 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
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.7.ebuild b/dev-util/clazy/clazy-1.7.ebuild
new file mode 100644
index 000000000000..6d9e004a7686
--- /dev/null
+++ b/dev-util/clazy/clazy-1.7.ebuild
@@ -0,0 +1,40 @@
+# 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/clang-5.0:=
+	>=sys-devel/llvm-5.0:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+
+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/files/clazy-1.7-gnuinstalldirs.patch b/dev-util/clazy/files/clazy-1.7-gnuinstalldirs.patch
new file mode 100644
index 000000000000..c58093a2db25
--- /dev/null
+++ b/dev-util/clazy/files/clazy-1.7-gnuinstalldirs.patch
@@ -0,0 +1,82 @@
+From 111c6971cd791f336eaaa8ef142c8212a7e65a3a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 30 Jun 2020 12:56:56 +0200
+Subject: [PATCH] Use more GNUInstallDirs (doc, man)
+
+---
+ CMakeLists.txt          | 21 ++++++++-------------
+ docs/man/CMakeLists.txt |  2 +-
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c55103b..2532a8d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,7 @@ endif()
+ 
+ include(FeatureSummary)
+ include(GenerateExportHeader)
+-include("GNUInstallDirs")
++include(GNUInstallDirs)
+ 
+ # Version setup
+ set(CLAZY_VERSION_MAJOR "1")
+@@ -184,8 +184,6 @@ if (NOT CLAZY_BUILD_WITH_CLANG)
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+   )
+ 
+-  set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR} CACHE STRING "Share directory name")
+-
+   if(NOT WIN32)
+     if(APPLE)
+       find_program(READLINK_CMD greadlink)
+@@ -200,27 +198,24 @@ if (NOT CLAZY_BUILD_WITH_CLANG)
+     configure_file(${CMAKE_CURRENT_LIST_DIR}/clazy.cmake ${CMAKE_BINARY_DIR}/clazy @ONLY)
+     install(PROGRAMS ${CMAKE_BINARY_DIR}/clazy DESTINATION bin)
+   else()
+-    install(PROGRAMS ${CMAKE_CURRENT_LIST_DIR}/clazy.bat DESTINATION bin)
++    install(PROGRAMS ${CMAKE_CURRENT_LIST_DIR}/clazy.bat DESTINATION ${CMAKE_INSTALL_BINDIR})
+     if(MSVC)
+-      install(PROGRAMS ${CMAKE_CURRENT_LIST_DIR}/clazy-cl.bat DESTINATION bin)
++      install(PROGRAMS ${CMAKE_CURRENT_LIST_DIR}/clazy-cl.bat DESTINATION ${CMAKE_INSTALL_BINDIR})
+     endif()
+   endif()
+ 
+   # Install the explanation README's
+-  set(DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/clazy)
+-
+   include(${CMAKE_CURRENT_LIST_DIR}/readmes.cmake)
+ 
+-  install(FILES ${README_LEVEL0_FILES} DESTINATION ${DOC_INSTALL_DIR}/level0)
+-  install(FILES ${README_LEVEL1_FILES} DESTINATION ${DOC_INSTALL_DIR}/level1)
+-  install(FILES ${README_LEVEL2_FILES} DESTINATION ${DOC_INSTALL_DIR}/level2)
+-  install(FILES ${README_manuallevel_FILES} DESTINATION ${DOC_INSTALL_DIR}/manuallevel)
++  install(FILES ${README_LEVEL0_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR}/level0)
++  install(FILES ${README_LEVEL1_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR}/level1)
++  install(FILES ${README_LEVEL2_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR}/level2)
++  install(FILES ${README_manuallevel_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR}/manuallevel)
+ 
+   # Install more doc files
+-  install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION ${DOC_INSTALL_DIR})
++  install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ 
+   # Build docs
+-  set(MAN_INSTALL_DIR "${SHARE_INSTALL_DIR}/man/man1")
+   add_subdirectory(docs)
+ 
+   # rpath
+diff --git a/docs/man/CMakeLists.txt b/docs/man/CMakeLists.txt
+index 5d86813..d9b3937 100644
+--- a/docs/man/CMakeLists.txt
++++ b/docs/man/CMakeLists.txt
+@@ -14,6 +14,6 @@ if(UNIX)
+     )
+     add_custom_target(man ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/clazy.1)
+ 
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clazy.1 DESTINATION ${MAN_INSTALL_DIR})
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clazy.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+   endif()
+ endif()
+-- 
+2.27.0
+