gentoo resync : 25.08.2020

6 files changed, 106 insertions, 209 deletions

diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index b091bc310487..fb85f1d03157 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,8 +1,7 @@
-AUX kig-19.08.3-pykig-python3.patch 4617 BLAKE2B 6c10c34462ef5c0387e35cdfe79aa8144474675f0ec565fcefb4c90d6ae182340dfc619afd823a7df8357b529c10a4a68b7bcd99e5d540832574a0a51d41e52b SHA512 c405b90184456066f085563637ec8c6e478d8bcc200e2d17baa32eb7dd3a208ec2f2d79b84777ddc8b0722819a6ac99427e8d5f2db31b89b0a9e37f38eb7fa1b
-AUX kig-19.08.3-scripter-crash.patch 829 BLAKE2B f783a2937f4348c928fa40018005a677619ddba477ac6332f92015b9a365ae8a990dce78d3972a1bead3931a6adeb04976bb058039ba48a12c7c4ded9157e94c SHA512 6463b14d7ff5b1884a03b1f6803fdb722524b591ceee5819251ee6e92c4991455d6426b4e42ebf55021820843edff3ab52ac191221f67b9d3def7f51490dedf5
+AUX kig-20.08.70-cmake-boostpython.patch 2660 BLAKE2B 51c473dd8733f44214571772b2249abe730087648d962ebab12faacaebaa2e1bb0788220faf2a03b110477a1112fce771d1b269d03e3a05670a35ffe02c82c86 SHA512 0abd06e611f90a8f73ecf5599377df45ae350c4352ff5c0cac47918d4938142bce9677a0430aa3aaf8d6f0edd5241f4751fc2187410b7287dd399caef6c8e7ec
 AUX kig-4.12.0-boostpython.patch 1014 BLAKE2B f860ac552eb6e50040ce7cdcb2891e246a64fa69002790015774ff2080fc6b7e850fdacc775d65ed79fc32e97e57304dcbb149f5089a8ecf981989f0894feb36 SHA512 fb9e9269fc4af850635eb88f5a97f2c61d7419fbaeff4bef0ed9d4ebf410c4cd02ab70733c3f1d0b08444e1a878fa74a9d691268f30c339b7855506e56c34fa8
-DIST kig-19.12.3.tar.xz 3500260 BLAKE2B 45ae92dae8927201f8a11f4c2087143e3301a4aef4d6e263644aab130957e5f98d334dc3ea65208783f587235fe217b4e03fa351232e469296b0c9e38b69430b SHA512 554b70c1ec7e62b52bdfb736cf17d685df68ffee00ebd4253e838f753e274c275a5df774f37240b2cb4778bfdc16b28c37f087772e61c82409397e92982e4109
-DIST kig-20.04.2.tar.xz 3482912 BLAKE2B 298ccdaeebedd6647ffe6cb53269c90483481633ae5f476578c32a31bd893cf0bace60f28bd2381a3caeb5bc44d85c2197d3842516cccb46735b994d6e9893ed SHA512 54055ceae86d780b6be44b97cd56dfe252db5a8e3b9d9bdd66320a500fbec3769b79731260f2b5a40f5c6cd9deb8c26fa0e2cab5dbb9ccf0b7c0da19c4b31fa5
-EBUILD kig-19.12.3.ebuild 1820 BLAKE2B fc22c6cb1a143e8dcacd818a797ae4745c34d68f2a243aeca298ffcd633dee0a01d7972b30cdfb8b72b57e672c63dfa356a6cbf48dda5782045174dc41290019 SHA512 bb8f50e1a182f7dc47969cc5e14a4cf1047f6a9f510ed6192084f961d1b196ba3f58fced247d0089afa133d9ed7c5e402c3d35109bcb4bffeaa9694de4c7f886
-EBUILD kig-20.04.2.ebuild 1723 BLAKE2B 45699d312085172c9babe63168c74c337e40ac8b1f752d7569060a3532df1856bc56969abfd79c0137a31278294692137cdff5e6924f501af2f759934183abf8 SHA512 78da8cf15391823c00051a5e7b04ffb770a10e86ece6e8a488a2e2355285184373f31af8fa606d1ed8f58566019e59d93c12dc9515f669e83c077df536ccf3cc
+DIST kig-20.04.3.tar.xz 3482876 BLAKE2B d56c3c03f1c90df991377ed1cf43fa734fd5d295e755af6833508540f6796b079025c1ea5eebbf6719a08bc2bec2a3f716e9d2d40bb7038b096941d357285343 SHA512 64d806c901387dfeaf799ededa22ffd6a2471025d6e3f91940e1f70c3619b86b8427aa1dd97bd59780083173d6e8951205cd8385714682131d45724d72efd963
+DIST kig-20.08.0.tar.xz 3490564 BLAKE2B 93fe20bea6a43c6ffaf83b07eaf365cb1fc7a334fe2eb93a686099f074bd382f0b1aca0562f28c0dfb7e828e3860bea306e2555076dbde6a0fa896ffa9b564cb SHA512 bc0e21bb575043c960f6c7ccc1fd138a56c68a578482afa9583be1b3a2c01b9dffd7297d4bc3ee39cd659f8cdc6eed3b00dc83e2fc1f7c6c495bcf720ce9fe77
+EBUILD kig-20.04.3.ebuild 1720 BLAKE2B b0a48bb08473bbb7f43341ee8ea86908a994d82762b77a0996b3df8f65c14740651019d9f3882395bdaee99213b8e1e3f4fdc72f5e4cbe1a6c2741e8f4e59dbd SHA512 daf6fef631f30e2f79af6db5e6517cab96d2f4219ce89b083e3746086dfc22882828c2462c24e497c6036311e47c2e9ba48705a2cc70a6215d3461ecc92ac67f
+EBUILD kig-20.08.0.ebuild 1772 BLAKE2B b3c8d6fc3df5b22a64b6ffd6615be83eb561ffba2f8cba17f7de98e8d681d056bc622028aac5c85b003be1055e89d0bc6c9de3be47bac50b244a9e83030fb156 SHA512 e8e3879d20a484af5bd47bc1862668195b385136f5d60d1974faff2410286d5c77fb427f79690921b0c5dad9e9d2f5af47989eaf818bcd6e81d6c6238b4d1580
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch b/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch
deleted file mode 100644
index 902c138495ec..000000000000
--- a/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From d72f33a14c22480b28c0f35d53293826f6ec787b Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Sat, 14 Dec 2019 19:49:09 +0100
-Subject: Port pykig to python 3
-
-Differential Revision: https://phabricator.kde.org/D25982
----
- pykig/pykig.py | 42 +++++++++++++++++++++---------------------
- 1 file changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/pykig/pykig.py b/pykig/pykig.py
-index 02f637d..3ee6e97 100644
---- a/pykig/pykig.py
-+++ b/pykig/pykig.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- #-------------------------------python------------------------pykig.py--#
- #                                                                       #
-@@ -170,9 +170,9 @@ class KigDocument(object):
-     self.of=of
-     try:
-       self.outfile = open(outfilename, 'w')
--    except IOError, value:
-+    except IOError as value:
- #      print >> sys.stderr, outfilename, 'unwritable'
--      print >> sys.stderr, value
-+      print(value,  file=sys.stderr)
-       sys.exit(2)
- #    KigOut._kigdocument=self
-     KigDOP._kd=self
-@@ -212,14 +212,14 @@ class KigDocument(object):
-       self.outfile.write(" </View>\n</KigDocument>\n")
-       if self.outfile != sys.stdout:
-         self.outfile.close()
--    except IOError, value:
--      print >> sys.stderr, value
-+    except IOError as value:
-+      print(value, file=sys.stderr)
-       sys.exit(2)
-     try:
-       if self.callkig:
-         err = os.system('kig ' + self.outfilename)
--    except Exception, value:
--      print >> sys.stderr, value      
-+    except Exception as value:
-+      print(value, file=sys.stderr)
-     if not self.of:
-       os.system('rm ' + self.outfilename)
- 
-@@ -501,7 +501,7 @@ def databuild(nomeclasse, nomekig, v="val"):
- 
- for d in data:
-   p1, p2, p3 = d
--  exec databuild(p1, p2, p3)
-+  exec (databuild(p1, p2, p3))
- 
- #####
- # Objects
-@@ -645,7 +645,7 @@ def objectbuild(nameclass, namekig, params, objparams):
- 
- for o in objects:
-   p1, p2, p3, p4 = o
--  exec objectbuild(p1, p2, p3, p4)
-+  exec (objectbuild(p1, p2, p3, p4))
- 
- #####
- # Properties
-@@ -688,7 +688,7 @@ def propertybuild(nameclass, namekig, params, objparams):
- 
- for p in property:
-   p1, p2, p3, p4 = p
--  exec propertybuild(p1, p2, p3, p4)
-+  exec (propertybuild(p1, p2, p3, p4))
- 
- #####
- # Start of properties definitions as Object's methods
-@@ -734,7 +734,7 @@ def methodsbuild(namekig):
- 
- for p in methods:
-   p1, p2, cl = p
--  exec methodsbuild(p1)
-+  exec (methodsbuild(p1))
-   for c in cl:
-     setattr(c, p2, method)
- 
-@@ -743,7 +743,7 @@ for p in methods:
- #####
- 
- def usage(codexit):
--  print >> sys.stderr, """
-+  print ("""
- usage: pykig.py [options...] file ...
- 
- Options:
-@@ -757,7 +757,7 @@ examples:
-     $ pykig.py my_file.kpy
-     $ pykig.py -o output_file.kig my_file.kpy
-     $ ...
--"""
-+""", file=sys.stderr)
-   sys.exit(codexit)
- 
- #####
-@@ -776,7 +776,7 @@ def prog():
-     _opts, _args = getopt.getopt(sys.argv[1:], "hvno:",\
-                                  ["help", "version", "nokig", "output="])
-   except getopt.GetoptError:
--    print "GetoptError"
-+    print ("GetoptError")
-     usage(2)
-   _callKig=True
-   _of=False
-@@ -784,7 +784,7 @@ def prog():
-     if _opt in ("-h", "--help"):
-       usage(0)
-     if _opt in ("-v", "--version"):
--      print "Version:", version
-+      print ("Version:", version)
-       sys.exit(0)
-     if _opt in ("-n", "--nokig"):
-       _callKig=False
-@@ -793,19 +793,19 @@ def prog():
-       _of=True
-       _callKig=False   # if there's an output file, don't call Kig
-   if len(_args)==0:
--    _infilename=raw_input("Input file name: ")
-+    _infilename=input("Input file name: ")
-     if not _infilename:
--      print "No input file name."
-+      print ("No input file name.")
-       usage(2)
-   elif len(_args)==1:
-     _infilename=_args[0]
-   else:
--    print "No input file name."
-+    print ("No input file name.")
-     usage(2)
-   try:
-     _infile = open(_infilename, 'r')
-   except:
--    print >> sys.stderr, _infilename, "input file can't be read."
-+    print (_infilename, "input file can't be read.", file=sys.stderr)
-     sys.exit(2)
-   if _of:
-     if _outfilename=="-":
-@@ -817,9 +817,9 @@ def prog():
-   kigdocument=KigDocument(_outfilename, _callKig, _of)
-   kd=kigdocument
-   try:
--    execfile(_infilename, globals())
-+    exec(open(_infilename).read(), globals())
-   except:
--    print >> sys.stderr, 'Syntax error in', _infilename
-+    print ('Syntax error in', _infilename, file=sys.stderr)
-     _info = sys.exc_info()    # print out the traceback
-     traceback.print_exc()
-     sys.exit(3)
--- 
-cgit v1.1
diff --git a/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch b/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch
deleted file mode 100644
index 9540e9044f3b..000000000000
--- a/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 211f8501ec4cf77ed68253783d58a662b5513612 Mon Sep 17 00:00:00 2001
-From: Maurizio Paolini <paolini@dmf.unicatt.it>
-Date: Sat, 11 Jan 2020 19:50:33 +0100
-Subject: Fix crash upon exit after transition python2 -> python3 when using
- scripting (bug #416037)
-
-Reviewed By: kkevin
-Differential Revision: https://phabricator.kde.org/D12833
-CCBUG: 416037
----
- scripting/python_scripter.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc
-index bb5db39..3edec77 100644
---- a/scripting/python_scripter.cc
-+++ b/scripting/python_scripter.cc
-@@ -427,8 +427,8 @@ PythonScripter::PythonScripter()
- PythonScripter::~PythonScripter()
- {
-   PyErr_Clear();
--  Py_Finalize();
-   delete d;
-+  Py_FinalizeEx();
- }
- 
- class CompiledPythonScript::Private
--- 
-cgit v1.1
diff --git a/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch b/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch
new file mode 100644
index 000000000000..bd0c13ad3772
--- /dev/null
+++ b/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch
@@ -0,0 +1,91 @@
+From 39bf05d48f899612dffa07c73ac276f52820a7c9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 13 Jul 2020 00:41:25 +0200
+Subject: [PATCH] Use CMake's own FindBoost module to detect Boost Python
+
+Introduces BOOSTPYTHON_VERSION_MAJOR_MINOR for packaging.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 26 ++++++++++++--------------
+ 1 file changed, 12 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e65585fb..e07a4dc6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,7 +51,8 @@ endif()
+ 
+ include(KigConfigureChecks.cmake)
+ 
+-find_package(BoostPython)
++set(BOOSTPYTHON_VERSION_MAJOR_MINOR python37 CACHE STRING "Version of BoostPython to feed CMake's FindBoost")
++find_package(Boost 1.70 COMPONENTS ${BOOSTPYTHON_VERSION_MAJOR_MINOR})
+ 
+ add_subdirectory( doc )
+ add_subdirectory( icons )
+@@ -61,15 +62,15 @@ add_subdirectory( macros )
+ add_subdirectory( data )
+ add_subdirectory( pykig )
+ 
+-if(BoostPython_FOUND)
++if(Boost_FOUND)
++  find_package(PythonLibs 3 REQUIRED)
++  include_directories(${PYTHON_INCLUDE_DIRS})
+   add_subdirectory( scripting )
+   add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING)
+-endif(BoostPython_FOUND)
++endif()
+ 
+ set_package_properties(
+-   BoostPython PROPERTIES
+-   DESCRIPTION "Python scripting support in Boost"
+-   URL "https://www.boost.org/"
++   Boost PROPERTIES
+    TYPE OPTIONAL
+    PURPOSE "Kig can optionally use Boost.Python for Python scripting"
+ )
+@@ -85,9 +86,6 @@ set_package_properties(
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+ 
+ include_directories( ${CMAKE_SOURCE_DIR}/modes )
+-if(BoostPython_FOUND)
+-  include_directories(${BoostPython_INCLUDE_DIRS})
+-endif(BoostPython_FOUND)
+ 
+ # kigpart
+ 
+@@ -225,7 +223,7 @@ ki18n_wrap_ui(kigpart_PART_SRCS
+    misc/kigcoordinateprecisiondialog.ui
+ )
+ 
+-if(BoostPython_FOUND)
++if(Boost_FOUND)
+   set(kigpart_PART_SRCS ${kigpart_PART_SRCS}
+      modes/popup/scriptactionsprovider.cc
+      scripting/newscriptwizard.cc
+@@ -236,7 +234,7 @@ if(BoostPython_FOUND)
+   )
+ 
+   kde_source_files_enable_exceptions(scripting/python_scripter.cc)
+-endif(BoostPython_FOUND)
++endif()
+ 
+ 
+ add_library(kigpart MODULE ${kigpart_PART_SRCS})
+@@ -256,9 +254,9 @@ target_link_libraries(kigpart
+   ${KDE5_KUTILS_LIBS}
+ )
+ 
+-if(BoostPython_FOUND)
+-  target_link_libraries(kigpart ${BoostPython_LIBRARIES} ${KDE5_KTEXTEDITOR_LIBS})
+-endif(BoostPython_FOUND)
++if(Boost_FOUND)
++  target_link_libraries(kigpart Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR} ${PYTHON_LIBRARIES})
++endif()
+ 
+ if (Qt5XmlPatterns_FOUND)
+   target_link_libraries(kigpart Qt5::XmlPatterns)
+-- 
+2.27.0
+
diff --git a/kde-apps/kig/kig-20.04.2.ebuild b/kde-apps/kig/kig-20.04.3.ebuild
index 74fde97c6f87..7bd792799824 100644
--- a/kde-apps/kig/kig-20.04.2.ebuild
+++ b/kde-apps/kig/kig-20.04.3.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PYTHON_COMPAT=( python3_{7,8} )
 KFMIN=5.70.0
-QTMIN=5.14.1
+QTMIN=5.14.2
 inherit python-single-r1 ecm kde.org
 
 DESCRIPTION="KDE Interactive Geometry tool"
@@ -16,7 +16,7 @@ https://edu.kde.org/kig/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kig/kig-19.12.3.ebuild b/kde-apps/kig/kig-20.08.0.ebuild
index 02a8c7729269..582156bfe01a 100644
--- a/kde-apps/kig/kig-19.12.3.ebuild
+++ b/kde-apps/kig/kig-20.08.0.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{6,7} )
-KFMIN=5.63.0
-QTMIN=5.12.3
+PYTHON_COMPAT=( python3_{7,8} )
+KFMIN=5.72.0
+QTMIN=5.14.2
 inherit python-single-r1 ecm kde.org
 
 DESCRIPTION="KDE Interactive Geometry tool"
@@ -16,7 +16,7 @@ https://edu.kde.org/kig/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -42,7 +42,7 @@ RDEPEND="${PYTHON_DEPS}
 	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
 	scripting? (
 		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.48:=[python,${PYTHON_MULTI_USEDEP}]
+			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
 		')
 	)
 "
@@ -50,11 +50,7 @@ DEPEND="${RDEPEND}
 	>=kde-frameworks/ktexteditor-${KFMIN}:5
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
-	"${FILESDIR}"/${PN}-19.08.3-pykig-python3.patch
-	"${FILESDIR}"/${PN}-19.08.3-scripter-crash.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-20.08.70-cmake-boostpython.patch )
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -68,8 +64,9 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
 		$(cmake_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake_use_find_package scripting BoostPython)
+		$(cmake_use_find_package scripting Boost)
 	)
 
 	ecm_src_configure