From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- kde-frameworks/extra-cmake-modules/Manifest | 5 +- .../extra-cmake-modules-5.55.0.ebuild | 69 --------------------- .../extra-cmake-modules-5.56.0.ebuild | 72 ++++++++++++++++++++++ .../extra-cmake-modules-5.55.0-clazy-1.5.patch | 41 ------------ 4 files changed, 74 insertions(+), 113 deletions(-) delete mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild create mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.56.0.ebuild delete mode 100644 kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch (limited to 'kde-frameworks/extra-cmake-modules') diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index f62a636fc56a..6a037df7d9f9 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,7 +1,6 @@ AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697 -AUX extra-cmake-modules-5.55.0-clazy-1.5.patch 1666 BLAKE2B 1ce8b8f9077f55748d1150578e445afd2a17397af0020889198d7a0ec7b2f21d3ac6efada3de1d404635e1e5b40d52aaa02680285dd7013728b3665a9588c0c2 SHA512 8753493a71552c9fdfcb720fe57cb72e03aea56babd8e9a839e0d6f630852d0b9fb2831ab8fe42bdd64db3473cf125290895696799193c4ccd79ac4b2f828a35 DIST extra-cmake-modules-5.54.0.tar.xz 324996 BLAKE2B 37ba7eb0b651da5bf18de292a59c9783b7d85801701223580144d366da3621da66ad2c6b8a55479d67e27249784be9994c0cdacdee540e601b34b5ed5d5af863 SHA512 2c592ab659dc2c1167111d394b976f7d008b9c3e8e18aea06001f4852f93d6a0e61c2ea5f6add2680e11f76da9f5f8c437afd350c5d3224cf1e9adba2dd765e1 -DIST extra-cmake-modules-5.55.0.tar.xz 325208 BLAKE2B d085a7000b829253d9d67025f762cdadae79d785f62e3c339c364b469bc05eee575ed2f06d82d3b0f38cf08811f237916603e24ebeb0c7ef52db8c0a875020c1 SHA512 d746cf01d39cf8bb7ee451c0a250d123ac79dcffa32a0db7b9ec6618df4acbe3063784feb8fd346f8739753d5cd2a15f0bdee0eb47cae471aa5b54c210397f42 +DIST extra-cmake-modules-5.56.0.tar.xz 325764 BLAKE2B 5f86de1c04e2854bde0d102bcc9f1434527ecae967a00452715f1b5c5cb9c8a60ed0ebdc388e10b66451c2580eb57d76253ef450e3678fe72bec3117e976f2f9 SHA512 8064b0807c696c9fd2ebfa8761055ad6b840b1e2d6a3bf7f297099bf0eda5b5b65376294501bdac830839f4874391ecc85e5306b5e93c5fbac3b6aa2689a888e EBUILD extra-cmake-modules-5.54.0.ebuild 1409 BLAKE2B b2f405d9f1e757004ac426024e9c64448387867395254e6549f5aa117a83d4fc17034cd8d12051fd5194422eae75edd9eed9cef982b43a6daa7f28e833ca3de1 SHA512 e8f31c6de04400a642f450184e05ba42b22ef211a27458ad04927ba4d8b5ee698c833903845e79b06ccedd5ce5c63420616facecdbdb8be5eabf310739d8d393 -EBUILD extra-cmake-modules-5.55.0.ebuild 1449 BLAKE2B c22fc62a7649ce6721a4e946d07a24b960a5e161e19ce988b035e221356163cfbac7e8bed29a0a14d690937bc1327b2b8fbfc61c5ebc9a81859636b2f0f7fc93 SHA512 f0727f0fc10fa5f746c17ac68a66aa0f162727eeb22e472f4b0081b986d54c1a1f6f90b2faa740e48b78a36b91af5a365ead703584824588b66db40c50d916c4 +EBUILD extra-cmake-modules-5.56.0.ebuild 1550 BLAKE2B b49b8a140c3e441f8b3c32cc94c6f1df2fb6006916a195520e95ad9757fdf1dd6fc7cc5f1fb05304726c520e4d39888fd865a4cde2e9fdf297b8f3a139bbd46b SHA512 dfa5ec4e2d31740c4cdec8f3fde0cee59c7715dc31eb49a44c50455353c806b71a54af150bc6e5783f32ae7a55a011870671be2904caccbf8cff046ada7e88e5 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild deleted file mode 100644 index 91fdffe86331..000000000000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.55.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -ECM_KDEINSTALLDIRS="false" -KDE_AUTODEPS="false" -KDE_DEBUG="false" -KDE_QTHELP="false" -KDE_TEST="false" -inherit kde5 python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -IUSE="doc test" - -BDEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - $(add_qt_dep qthelp) - ) - test? ( - $(add_qt_dep qtcore) - $(add_qt_dep linguist-tools) - ) -" -RDEPEND=" - app-arch/libarchive[bzip2] -" - -PATCHES=( - "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" - "${FILESDIR}/${P}-clazy-1.5.patch" -) - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_QTHELP_DOCS=$(usex doc) - -DBUILD_HTML_DOCS=$(usex doc) - -DBUILD_MAN_DOCS=$(usex doc) - -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" - ) - use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) - - kde5_src_configure -} - -src_test() { - # ECMToolchainAndroidTest passes but then breaks src_install - # ECMPoQmToolsTest is broken, bug #627806 - local myctestargs=( - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" - ) - - kde5_src_test -} diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.56.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.56.0.ebuild new file mode 100644 index 000000000000..b32d244d967e --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.56.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +ECM_KDEINSTALLDIRS="false" +KDE_AUTODEPS="false" +KDE_DEBUG="false" +KDE_QTHELP="false" +KDE_TEST="false" +inherit kde5 python-any-r1 + +DESCRIPTION="Extra modules and scripts for CMake" +HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git" + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" +IUSE="doc test" + +BDEPEND=" + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + $(add_qt_dep qthelp) + ) + test? ( + $(add_qt_dep qtcore) + $(add_qt_dep linguist-tools) + ) +" +RDEPEND=" + app-arch/libarchive[bzip2] +" + +PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" ) + +python_check_deps() { + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + kde5_src_prepare + # Requires PyQt5, bug #680256 + sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \ + tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests" +} + +src_configure() { + local mycmakeargs=( + -DBUILD_QTHELP_DOCS=$(usex doc) + -DBUILD_HTML_DOCS=$(usex doc) + -DBUILD_MAN_DOCS=$(usex doc) + -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" + ) + + kde5_src_configure +} + +src_test() { + # ECMToolchainAndroidTest passes but then breaks src_install + # ECMPoQmToolsTest is broken, bug #627806 + local myctestargs=( + -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" + ) + + kde5_src_test +} diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch deleted file mode 100644 index 0ac07a60ee2b..000000000000 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ba3341c83b186e021337761e5fd689614fe14177 Mon Sep 17 00:00:00 2001 -From: Elvis Angelaccio -Date: Sat, 2 Feb 2019 18:46:27 +0100 -Subject: Fix ENABLE_CLAZY option with clazy >= 1.5 - -Summary: -clazy 1.5 renamed its plugin from from `ClangLazy.so` to -`ClazyPlugin.so` and from `clang-lazy` to `clazy`. - -Reviewers: apol, smartins - -Subscribers: kde-frameworks-devel, kde-buildsystem - -Tags: #frameworks, #build_system - -Differential Revision: https://phabricator.kde.org/D18680 ---- - kde-modules/KDECMakeSettings.cmake | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake -index 3f7f5a8..17d79a0 100644 ---- a/kde-modules/KDECMakeSettings.cmake -+++ b/kde-modules/KDECMakeSettings.cmake -@@ -293,7 +293,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - option(ENABLE_CLAZY "Enable Clazy warnings" OFF) - - if(ENABLE_CLAZY) -- set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") -+ find_library(CLAZY_v1_5_FOUND ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX}) -+ if(CLAZY_v1_5_FOUND) # clazy >= 1.5 -+ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clazy") -+ else() # clazy < 1.5 -+ set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") -+ endif() - endif() - endif() - --- -cgit v1.1 - -- cgit v1.2.3