summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-03-11 17:50:58 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-03-11 23:21:16 +0100
commit44fe498c423b888cbe2c88f3776a9144e241c8c9 (patch)
tree261b870b84ede031cca2a8629deb55ce434920fa /kde-frameworks/extra-cmake-modules
parentdev-games/openscenegraph: Drop 3.5.1 (diff)
downloadgentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.tar.gz
gentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.tar.bz2
gentoo-44fe498c423b888cbe2c88f3776a9144e241c8c9.zip
kde-frameworks: Drop KDE Frameworks 5.40.0
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'kde-frameworks/extra-cmake-modules')
-rw-r--r--kde-frameworks/extra-cmake-modules/Manifest1
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild63
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch75
3 files changed, 0 insertions, 139 deletions
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 3cde05475312..ccde81f79ab2 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,3 +1,2 @@
-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
DIST extra-cmake-modules-5.44.0.tar.xz 314212 BLAKE2B 67d6a732139937aac95c79bdbf66e33ba7695465f1608e556456f916ced7dadb80b97a928841f18a804a933228b4451e34e5765921440137c798b4ba5bdfbb3e SHA512 02b9dd0bc2a90b6f1973a9914b1f40a331fdaed0f004a732eb197e6ba5266b78bcb51ede3dab042c86c2db76c61bf8b9e8ccf71be27a5dbdaeed4c4fb0a365c9
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/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 <andreas.sturmlechner@gmail.com>
-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 <andreas.sturmlechner@gmail.com>
-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
-