summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-09-14 10:06:37 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-09-14 11:03:14 +0200
commit3f790d1078752189ea5f7a79a2c4c7d643fa88c0 (patch)
tree9bd4ac2f3f66366b1b4a643ddf2bbba13c6a118b /kde-frameworks/extra-cmake-modules
parentkde-frameworks/breeze-icons-rcc: drop 5.82.0* (diff)
downloadgentoo-3f790d1078752189ea5f7a79a2c4c7d643fa88c0.tar.gz
gentoo-3f790d1078752189ea5f7a79a2c4c7d643fa88c0.tar.bz2
gentoo-3f790d1078752189ea5f7a79a2c4c7d643fa88c0.zip
kde-frameworks/extra-cmake-modules: drop 5.82.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
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.82.0.ebuild83
-rw-r--r--kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch81
3 files changed, 0 insertions, 165 deletions
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 08f5e4212595..b327c5952ca8 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,3 +1,2 @@
-DIST extra-cmake-modules-5.82.0.tar.xz 313052 BLAKE2B 40f4a64ce1b9175137f01db9f148b21bde931934d238b3080fa8a8e6830fa556d5c0506ddd52705d3d0b1d419508663a0f96d7e9dbe565061081c48c47eabc5f SHA512 a8c8d1d15718760de42238b121ed1294d12d36f1ef25acdd2542f12a56d5091a5cc0135884b6c97e62123d64fc80e2756dccd32c88b65caaf6e86418bae4217f
DIST extra-cmake-modules-5.85.0.tar.xz 318048 BLAKE2B b33d1e4d131349f706f7ef3cc75b59dc48299f03c62699fb1cdc6a9c496ebc527628bf07da41241ddd86128c5fa44b2b2c0a68509a0eefe742efa37d02386be0 SHA512 78ff26496c37d93106449663ab30ad35784a3ad668f4b1ec49d1ef51916e5de050e828fec8f6dc4ee5e2bed95cf22becb06ddd971dc46b65acc19934f5c1c5b3
DIST extra-cmake-modules-5.86.0.tar.xz 318384 BLAKE2B 01e4e9adfaa9df10a53d7b67d230eee60bb1f4520b7c4559140ee1e7ee3afd3fb192700d567e015be25f056caeceb39886fa3dc036f5e6c8ac41722b0df23442 SHA512 88fbd26bebf9dda99593eccf49029b845aee0c48b31e7893e2dccc5eac53376e348275a09b37199b9d69de6ce41f939570e5e63e11e04bb537b669d2b90cf8d6
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
deleted file mode 100644
index 8d8b8249034a..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-QTMIN=5.15.2
-inherit cmake kde.org python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
-IUSE="doc test"
-
-RESTRICT+=" !test? ( test )"
-
-RDEPEND="
- app-arch/libarchive[bzip2]
-"
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
- ')
- >=dev-qt/qthelp-${QTMIN}:5
- )
- test? (
- >=dev-qt/linguist-tools-${QTMIN}:5
- >=dev-qt/qtcore-${QTMIN}:5
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
- "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
- "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch"
- "${FILESDIR}/${P}-sphinx-4.patch" # bug 789096, pending upstream MR 121
-)
-
-python_check_deps() {
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
- has_version "dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_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=(
- -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
- -DBUILD_QTHELP_DOCS=$(usex doc)
- -DBUILD_HTML_DOCS=$(usex doc)
- -DBUILD_MAN_DOCS=$(usex doc)
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # ECMToolchainAndroidTest passes but then breaks src_install
- # ECMPoQmToolsTest is broken, bug #627806
- # KDEFetchTranslations can not possibly succeed in releases, bug #764953
- # possible race condition with multiple jobs, bug #701854
- local myctestargs=(
- -j1
- -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)"
- )
-
- cmake_src_test
-}
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch
deleted file mode 100644
index 7ccd024affc4..000000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 02abfc3695b71e05e3d5df83514f50ec0ab60bdf Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 14 May 2021 20:42:02 +0200
-Subject: [PATCH] Fix doc build with Sphinx 4
-
-Port away from removed functions. In particular, port to the new index structure which was introduced in 1.4 (released november 2016).
-Also account for the new default location of built man pages.
-
-BUG: 436818
----
- docs/CMakeLists.txt | 3 ++-
- docs/sphinx/ext/ecm.py | 13 ++++++++-----
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 84cca9ea..32687b64 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -110,7 +110,8 @@ if(BUILD_MAN_DOCS)
- set(name "${CMAKE_MATCH_1}")
- set(sec "${CMAKE_MATCH_2}")
- install(
-- FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec}
-+ FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec} ${CMAKE_CURRENT_BINARY_DIR}/man/${sec}/${name}.${sec}
-+ OPTIONAL
- DESTINATION ${MAN_INSTALL_DIR}/man${sec}
- )
- endif()
-diff --git a/docs/sphinx/ext/ecm.py b/docs/sphinx/ext/ecm.py
-index 8667b367..a09e4890 100644
---- a/docs/sphinx/ext/ecm.py
-+++ b/docs/sphinx/ext/ecm.py
-@@ -5,6 +5,7 @@
- #
- # SPDX-License-Identifier: BSD-3-Clause
-
-+import html
- import os
- import re
-
-@@ -19,8 +20,11 @@ CMakeLexer.tokens["args"].append(('(\\$<)(.+?)(>)',
-
- # Monkey patch for sphinx generating invalid content for qcollectiongenerator
- # https://bitbucket.org/birkenfeld/sphinx/issue/1435/qthelp-builder-should-htmlescape-keywords
--from sphinx.util.pycompat import htmlescape
--from sphinx.builders.qthelp import QtHelpBuilder
-+try:
-+ from sphinxcontrib.qthelp import QtHelpBuilder
-+except ImportError:
-+ # sphinx < 4.0
-+ from sphinx.builders.qthelp import QtHelpBuilder
- old_build_keywords = QtHelpBuilder.build_keywords
- def new_build_keywords(self, title, refs, subitems):
- old_items = old_build_keywords(self, title, refs, subitems)
-@@ -29,13 +33,12 @@ def new_build_keywords(self, title, refs, subitems):
- before, rest = item.split("ref=\"", 1)
- ref, after = rest.split("\"")
- if ("<" in ref and ">" in ref):
-- new_items.append(before + "ref=\"" + htmlescape(ref) + "\"" + after)
-+ new_items.append(before + "ref=\"" + html.escape(ref) + "\"" + after)
- else:
- new_items.append(item)
- return new_items
- QtHelpBuilder.build_keywords = new_build_keywords
-
--
- from docutils.parsers.rst import Directive, directives
- from docutils.transforms import Transform
- try:
-@@ -127,7 +130,7 @@ class _ecm_index_entry:
- self.desc = desc
-
- def __call__(self, title, targetid):
-- return ('pair', u'%s ; %s' % (self.desc, title), targetid, 'main')
-+ return ('pair', u'%s ; %s' % (self.desc, title), targetid, 'main', None)
-
- _ecm_index_objs = {
- 'manual': _ecm_index_entry('manual'),
---
-GitLab
-