Merge updates from master

5 files changed, 13 insertions, 89 deletions

diff --git a/dev-util/buildbot/files/pypugjs-2.8.0.patch b/dev-util/buildbot/files/pypugjs-2.8.0.patch
deleted file mode 100644
index d34c6fac1af8..000000000000
--- a/dev-util/buildbot/files/pypugjs-2.8.0.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sat, 25 Apr 2020 11:53:06 -0700
-Subject: [PATCH] Initial pyjade port to pypugjs
-
----
- common/code_spelling_ignore_words.txt        |  1 +
- master/buildbot/test/unit/test_www_config.py |  8 ++++----
- master/buildbot/www/config.py                | 10 +++++-----
- master/docs/manual/configuration/www.rst     | 10 ++++++----
- master/docs/spelling_wordlist.txt            |  2 +-
- master/setup.py                              |  4 ++--
- requirements-ci.txt                          |  2 +-
- 7 files changed, 20 insertions(+), 17 deletions(-)
-
-diff --git a/buildbot/test/unit/test_www_config.py b/buildbot/test/unit/test_www_config.py
-index 23a108e..a8c24ec 100644
---- a/buildbot/test/unit/test_www_config.py
-+++ b/buildbot/test/unit/test_www_config.py
-@@ -107,10 +107,10 @@ class IndexResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
-     def test_parseCustomTemplateDir(self):
-         exp = {'views/builds.html': '<div>\n</div>'}
-         try:
--            # we make the test work if pyjade is present or note
--            # It is better than just skip if pyjade is not there
--            import pyjade  # pylint: disable=import-outside-toplevel
--            [pyjade]
-+            # we make the test work if pypugjs is present or note
-+            # It is better than just skip if pypugjs is not there
-+            import pypugjs  # pylint: disable=import-outside-toplevel
-+            [pypugjs]
-             exp.update({'plugin/views/plugin.html':
-                         '<div class="myclass"><pre>this is customized</pre></div>'})
-         except ImportError:
-diff --git a/buildbot/www/config.py b/buildbot/www/config.py
-index a021299..50bae4d 100644
---- config.py	2020-02-27 13:34:10.000000000 -0800
-+++ config2.py	2020-05-11 17:26:44.587026761 -0700
-@@ -61,11 +61,11 @@
-         res = {}
-         allowed_ext = [".html"]
-         try:
--            import pyjade   # pylint: disable=import-outside-toplevel
-+            import pypugjs   # pylint: disable=import-outside-toplevel
-             allowed_ext.append(".jade")
-         except ImportError:  # pragma: no cover
--            log.msg("pyjade not installed. Ignoring .jade files from {}".format(template_dir))
-+            log.msg("pypugjs not installed. Ignoring .jade files from {}".format(template_dir))
--            pyjade = None
-+            pypugjs = None
-         for root, dirs, files in os.walk(template_dir):
-             if root == template_dir:
-                 template_name = posixpath.join("views", "%s.html")
-@@ -86,9 +86,9 @@
-                 elif ext == ".jade":
-                     with open(fn) as f:
-                         jade = f.read()
--                        parser = pyjade.parser.Parser(jade)
-+                        parser = pypugjs.parser.Parser(jade)
-                         block = parser.parse()
--                        compiler = pyjade.ext.html.Compiler(
-+                        compiler = pypugjs.ext.html.Compiler(
-                             block, pretty=False)
-                         html = compiler.compile()
-                 res[template_name % (basename,)] = html
-diff --git a/setup.py b/master/setup.py
-index 8fca506..1f32a74 100755
---- a/setup.py
-+++ b/setup.py
-@@ -490,8 +490,8 @@ test_deps = [
-     # http client libraries
-     'treq',
-     'txrequests',
--    # pyjade required for custom templates tests
--    'pyjade',
-+    # pypugjs required for custom templates tests
-+    'pypugjs',
-     # boto3 and moto required for running EC2 tests
-     'boto3',
-     'moto',
---
-libgit2 0.99.0
-
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.90.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.90.0.ebuild
index efec6ae19671..1c17f2e162f6 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.90.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.90.0.ebuild
@@ -14,6 +14,9 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="nls"
 
+# requires installed instance
+RESTRICT="test"
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/profiles/package.mask b/profiles/package.mask
index f1918fc4ea22..c46fd544a732 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Zoltan Puskas <zoltan@sinustrom.info> (2022-02-07)
+# Fork of sci-libs/opencascade. Upstream unmaintained due to opencascade
+# becoming community friendly and making this fork obsolete. Recommends moving
+# to opencascade. See: https://github.com/tpaviot/oce/issues/745
+# Blocks deprecation of sci-libs/vtk-8.2.0.
+# Removal on 2022-03-01. Bug #832625.
+sci-libs/oce
+
 # Stephan Hartmann <sultan@gentoo.org> (2022-02-06)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
diff --git a/sci-electronics/kicad/kicad-5.1.12.ebuild b/sci-electronics/kicad/kicad-5.1.12-r1.ebuild
index 3957488f0a2b..733f5b237d03 100644
--- a/sci-electronics/kicad/kicad-5.1.12.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,11 +16,10 @@ SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2+ GPL-3+ Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples github +ngspice occ +oce openmp +python"
+IUSE="doc examples github +ngspice +occ openmp +python"
 
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( occ oce )
 "
 
 COMMON_DEPEND="
@@ -37,7 +36,6 @@ COMMON_DEPEND="
 		>sci-electronics/ngspice-27[shared]
 	)
 	occ? ( <sci-libs/opencascade-7.5.3:=[vtk(+)] )
-	oce? ( sci-libs/oce )
 	python? (
 		$(python_gen_cond_dep '
 			>=dev-libs/boost-1.61:=[context,nls,threads(+),python,${PYTHON_USEDEP}]
@@ -103,7 +101,6 @@ src_configure() {
 		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
 		-DKICAD_SPICE="$(usex ngspice)"
 		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_USE_OCE="$(usex oce)"
 		-DKICAD_INSTALL_DEMOS="$(usex examples)"
 		-DCMAKE_SKIP_RPATH="ON"
 	)
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 09d8f72c361a..cd956ca81c5d 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -13,7 +13,6 @@
 		<flag name="github">Add github support into PCB editor</flag>
 		<flag name="ngspice">Enable circuit simulation</flag>
 		<flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag>
-		<flag name="oce">Enable viewing 3D rendering of designs via <pkg>sci-libs/oce</pkg></flag>
 		<flag name="python">Enable python scripting support</flag>
 		<flag name="pcm">Enable plugin content manager</flag>
 	</use>