gentoo resync : 16.09.2021

5 files changed, 15 insertions, 102 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index a0a292311caf..f6574f6b6e3e 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,9 +1,8 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
 AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa07049667ec2e4e986e459fa557ec171dde2746ff603b7d6a18f3197aa025ff1ee07d89e6dd17a722abde379aed69eaee58b99131c289efa979ad1bc3dc91c SHA512 3ba5f3d6cdf6afb230378e9891426ab64414eb19876ad0a7253b4301a50cd23a1bfbe9f5d267545fe788e846a4f86f93c09887b5f76f96f19643f0e18d6b0ba1
 AUX extra-cmake-modules-5.74.0-disable-qmlplugindump.patch 2677 BLAKE2B 7ee3d039291f65e667d83dafbedf1a7790db9c411962dca48dadf8e65d25733cf1f74b406b871986340e65ab43cea586739274d3e9e36ad00021bfa1fc6700a8 SHA512 47105664fb59b5bee31b58c034e4e83cfa93983d40d369ff82204a35195171a5fab6063f0257eead5186fadd17f87c378daacecc3c9cdb63fdfd0dbe42fe56a7
-AUX extra-cmake-modules-5.82.0-sphinx-4.patch 2959 BLAKE2B 1edd0052595551e33b231cc7cfac2a4bcd60787a1a126f5e5d2b5ab0ebe0c7f2850feb0e154ebbdc4104e917eecd342456d1f82a19c43e849757fa036e89e21c SHA512 af39e29c46ebdc22fe3c0d090b1fa5a4948909798521e773f5f35cfb793132d483f4d83126641f2fd53d193d672b2f05be90f3c503a10baf907871c9fbf8f684
-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
-EBUILD extra-cmake-modules-5.82.0.ebuild 2014 BLAKE2B be99e95ae4343cb94f1b7ff1805b19e52bdd122be61050de990189345dcae561b4ddd1d15e6b61aee751206bc9bf55d7635717773887e3cce551997d22046a9f SHA512 4532518bbc890485c1970436a215e4d268fec3b0d6cd251fca2a29a5b16e7b61bfa0ec07db01a85f877aa0f8c3af525ded37bccf5cdb0fce450884e9af4520b7
-EBUILD extra-cmake-modules-5.85.0.ebuild 1823 BLAKE2B b3b0e5b5f98ae2606fe0ba5dc6f26cfd936cb3241e5da5d49f172b751e45fb453f65907fd297b4057ca4a02489e3c597a99df83508d620154fdf37bd209c18c5 SHA512 419b66e3f05220ba7d65108f4543305cf680175e7f5419f5f549488339e0e73bdc40769c2efd498284df15992ec6ab9f7cc35efec3b2076b9561eef71e9ded52
-MISC metadata.xml 479 BLAKE2B 51b802a3a0a624919d8ff7b5cbbf255932645c1154437def8efe73975cd4a0d3a046a4a7f0c4ca9c67ba7a75b1e458d35cae802766317bbf548c9647dd66bd1b SHA512 5e7d1c6f0b6682b7218b0d7c42876fa6469346d48a70e2ad841a82e25bcae7ea9b05b896637d861b7a72e49dafe826755fe2f1d56bd0ba26bad404fca6d2bd10
+DIST extra-cmake-modules-5.86.0.tar.xz 318384 BLAKE2B 01e4e9adfaa9df10a53d7b67d230eee60bb1f4520b7c4559140ee1e7ee3afd3fb192700d567e015be25f056caeceb39886fa3dc036f5e6c8ac41722b0df23442 SHA512 88fbd26bebf9dda99593eccf49029b845aee0c48b31e7893e2dccc5eac53376e348275a09b37199b9d69de6ce41f939570e5e63e11e04bb537b669d2b90cf8d6
+EBUILD extra-cmake-modules-5.85.0.ebuild 1818 BLAKE2B 5b656427e1b0a4c525428d985e9a3badde2543bdf7a71b3528cc6499b2111b43c6ea942b7916cd895ba720a56d852a5c7ac2051ec4faf552935ec3dc32d51185 SHA512 58a150ff3cc1f3f351d75dfbcf3b9faaa15ffb87a297152da746a2186f061475d54116ee3500f07a1fd33cc597ea4e31544c435d28e92b152abbaa975cd3fc5c
+EBUILD extra-cmake-modules-5.86.0.ebuild 1823 BLAKE2B b3b0e5b5f98ae2606fe0ba5dc6f26cfd936cb3241e5da5d49f172b751e45fb453f65907fd297b4057ca4a02489e3c597a99df83508d620154fdf37bd209c18c5 SHA512 419b66e3f05220ba7d65108f4543305cf680175e7f5419f5f549488339e0e73bdc40769c2efd498284df15992ec6ab9f7cc35efec3b2076b9561eef71e9ded52
+MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild
index fe872c28e049..706ddafde482 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild
@@ -11,7 +11,7 @@ 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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
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.86.0.ebuild
index 8d8b8249034a..fe872c28e049 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.86.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 QTMIN=5.15.2
 inherit cmake kde.org python-any-r1
 
@@ -11,21 +11,15 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc test"
 
-RESTRICT+=" !test? ( 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}]
-		')
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
 		>=dev-qt/qthelp-${QTMIN}:5
 	)
 	test? (
@@ -33,17 +27,18 @@ BDEPEND="
 		>=dev-qt/qtcore-${QTMIN}:5
 	)
 "
+RDEPEND="
+	app-arch/libarchive[bzip2]
+"
 
 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}]"
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
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
-
diff --git a/kde-frameworks/extra-cmake-modules/metadata.xml b/kde-frameworks/extra-cmake-modules/metadata.xml
index 4742999d83b1..007a8286d371 100644
--- a/kde-frameworks/extra-cmake-modules/metadata.xml
+++ b/kde-frameworks/extra-cmake-modules/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>