From 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 13 Mar 2018 16:55:35 +0000 Subject: gentoo resync : 13.03.2018 --- kde-frameworks/extra-cmake-modules/Manifest | 7 +- .../extra-cmake-modules-5.40.0-r1.ebuild | 63 ------------------ .../extra-cmake-modules-5.43.0.ebuild | 2 +- .../extra-cmake-modules-5.44.0.ebuild | 61 ++++++++++++++++++ ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 75 ---------------------- 5 files changed, 65 insertions(+), 143 deletions(-) delete mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild create mode 100644 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.44.0.ebuild delete mode 100644 kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.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 e85efa14250f..7b8aa92d1856 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,6 +1,5 @@ -AUX extra-cmake-modules-5.40.0-qmlplugindump-path.patch 2734 BLAKE2B 8ca74b3886fec8d18874a50eb82a170d3610f49d449ef53956f58b91a67c0a115de90c86776110f8d19d53929e42a80f5d986608c11bc1816ed3719dbd2238f8 SHA512 132d1b6d4af195ddd8bbeb1b3a084ae7838dfede85fabea9d70385b8abd41d1b76569c9d94eece8bcbfb7a1b047b4dd6a86fa29a61534d71c4b9b4dab0a271f9 -DIST extra-cmake-modules-5.40.0.tar.xz 312532 BLAKE2B 0054ee4d3d17f238c4940404c6f5e00c951d305b0fce3e206bdc84dff0be683d4dc7e7043db61019422d182385ec2990e05b2df384b14e7b248d492cf918e691 SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c DIST extra-cmake-modules-5.43.0.tar.xz 314064 BLAKE2B b1866e66c2d12d450aada3f5dca86bf1638906cb3f4a2aa36dea43d3d0b2edde5cba85caa6ca7e0f6bd007733db16f88c2108103b588d637f1001f711037561b SHA512 fcdd96ad0db73f75708fdc97bbc74e28ef271a5dc27d8730f57efaf9e451ed5aaa51d20831c3cf20c82d377d50d51ba4abbfd09cdfbf02998396f907f6fa9cc5 -EBUILD extra-cmake-modules-5.40.0-r1.ebuild 1319 BLAKE2B 51f4dd46c267d65f194eb8608bb7fd3fb7762827826bbe7bf9c1dc451d9b451ce4498c68cccdc714d8e47861d4e54728a401c3c40e206d69162c169849da9ef5 SHA512 8c227a7e9ec6085e03e6249c4397389320b5d054538f833194ed2a20d886b5b5c57dc70a62ffc4c4e70aed46c881c1c971e19454c16ac119eca3fc15f2b1b300 -EBUILD extra-cmake-modules-5.43.0.ebuild 1267 BLAKE2B 16cc49f1d8f9e322683fb43069d04b185d90153f165c3ba73e20956d20765932f17262f5147618c968536b1614e5bf2ecb1d121d0ff6d06ef67114472d892e66 SHA512 28b6f6101dd030d122ab97bd4b2da8f22bff631a4ca44245e05e667cd5d4bc1ff11f5ab90e46f2e96c06b6e9de43dc3253ca455d4efc122417d599c56cc9063b +DIST extra-cmake-modules-5.44.0.tar.xz 314212 BLAKE2B 67d6a732139937aac95c79bdbf66e33ba7695465f1608e556456f916ced7dadb80b97a928841f18a804a933228b4451e34e5765921440137c798b4ba5bdfbb3e SHA512 02b9dd0bc2a90b6f1973a9914b1f40a331fdaed0f004a732eb197e6ba5266b78bcb51ede3dab042c86c2db76c61bf8b9e8ccf71be27a5dbdaeed4c4fb0a365c9 +EBUILD extra-cmake-modules-5.43.0.ebuild 1262 BLAKE2B 1be765cb725c03c7dc9fd3f3904eb091189c6a079321a1c9a15785968782f72582aa7d629ce622f249a8e2e1b9ee2ebe873fb03153ebec01381bfbad15376d45 SHA512 a02411944c68c5fe52fd0743331c35d4cd42dc24c72aa28b41459b1900e4f0dc0b5239cd2eba15ec148901e823f0525e5c7482a1e8dc38bd42924a8848f3f5b1 +EBUILD extra-cmake-modules-5.44.0.ebuild 1267 BLAKE2B 16cc49f1d8f9e322683fb43069d04b185d90153f165c3ba73e20956d20765932f17262f5147618c968536b1614e5bf2ecb1d121d0ff6d06ef67114472d892e66 SHA512 28b6f6101dd030d122ab97bd4b2da8f22bff631a4ca44245e05e667cd5d4bc1ff11f5ab90e46f2e96c06b6e9de43dc3253ca455d4efc122417d599c56cc9063b MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild deleted file mode 100644 index 9e3b717fdaf6..000000000000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -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" -IUSE="doc test" - -DEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) - test? ( - $(add_qt_dep qtcore) - $(add_qt_dep linguist-tools) - ) -" -RDEPEND=" - app-arch/libarchive[bzip2] -" - -PATCHES=( "${FILESDIR}/${P}-qmlplugindump-path.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_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 ) - - cmake-utils_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.43.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild index 8b14f01dc797..dc003c96c9fb 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild @@ -14,7 +14,7 @@ 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" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" IUSE="doc test" DEPEND=" diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.44.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.44.0.ebuild new file mode 100644 index 000000000000..8b14f01dc797 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.44.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +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" +IUSE="doc test" + +DEPEND=" + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + ) + test? ( + $(add_qt_dep qtcore) + $(add_qt_dep linguist-tools) + ) +" +RDEPEND=" + app-arch/libarchive[bzip2] +" + +python_check_deps() { + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -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 ) + + cmake-utils_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.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch deleted file mode 100644 index a5b12aac3579..000000000000 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 099fc991b85e91aa4bbfd20ba005f0c3a0002f97 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 31 Jan 2018 15:32:46 +0100 -Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump - -Summary: -Without any hint, qmlplugindump version is whatever default is set by qtchooser. -Fix uses the same approach as FindQtWaylandScanner.cmake. - -Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. - -Reviewers: apol - -Subscribers: aacid, dfaure, cgiboudeaux, #frameworks, #build_system - -Tags: #frameworks, #build_system - -Differential Revision: https://phabricator.kde.org/D9116 ---- - modules/ECMFindQMLModule.cmake.in | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in -index 428d60a..8109ab8 100644 ---- a/modules/ECMFindQMLModule.cmake.in -+++ b/modules/ECMFindQMLModule.cmake.in -@@ -26,8 +26,11 @@ - #============================================================================= - - include(FindPackageHandleStandardArgs) -+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") - --find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) -+query_qmake(qt_binaries_dir QT_INSTALL_BINS) -+ -+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) - if(NOT QMLPLUGINDUMP_PROGRAM) - message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") - endif() --- -2.16.1 - -From 3e3ac52aef1bbe22d293a05253c69b755f59428c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 31 Jan 2018 15:58:10 +0100 -Subject: [PATCH] FindQtWaylandScanner.cmake: Use qmake-query for HINT - -Instead of hardcoded /usr/lib, same solution as in D9116 ---- - find-modules/FindQtWaylandScanner.cmake | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake -index 79a1b05..37ebbdb 100644 ---- a/find-modules/FindQtWaylandScanner.cmake -+++ b/find-modules/FindQtWaylandScanner.cmake -@@ -86,11 +86,14 @@ - #============================================================================= - - include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) -+include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") - - ecm_find_package_version_check(QtWaylandScanner) - -+query_qmake(qt_binaries_dir QT_INSTALL_BINS) -+ - # Find qtwaylandscanner --find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) -+find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS ${qt_binaries_dir}) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(QtWaylandScanner --- -2.16.1 - -- cgit v1.2.3