gentoo Easter resync : 12.04.2020

5 files changed, 3 insertions, 187 deletions

diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index d77e27aced89..9cd7f05c7208 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,10 +1,6 @@
 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-19.08.3-scripter-python3.patch 981 BLAKE2B 66a23977cbcbfaf7965d1264c1806991c8ab1f7636d7e8da83bc218efb011992f63c43b9b2ebadc5b8c21ce114f6a06c93b7c9a531372ac1abaa608ed9288f30 SHA512 a82612a8cb8e95e2a5e839d27bd27fe0f7942df6cf777ea10653791e26a4175fbdd47981c50ab3d5091831f58555c5b3dba94b4b383a916b21482176377bc21c
 AUX kig-4.12.0-boostpython.patch 1014 BLAKE2B f860ac552eb6e50040ce7cdcb2891e246a64fa69002790015774ff2080fc6b7e850fdacc775d65ed79fc32e97e57304dcbb149f5089a8ecf981989f0894feb36 SHA512 fb9e9269fc4af850635eb88f5a97f2c61d7419fbaeff4bef0ed9d4ebf410c4cd02ab70733c3f1d0b08444e1a878fa74a9d691268f30c339b7855506e56c34fa8
-DIST kig-19.08.3.tar.xz 3497128 BLAKE2B e6611dd70ef47d0c710b5127b01532da4dc0841dbbfd8a151a9a867970389aa3c46d74a1347504beef5ca3c6fbcfaf2521923d7e34306eba580d88ecf002b1f8 SHA512 7e5f315695e9678c3e95822da3e86328dd8d6521d83697c623ac0175ae96fe13490d39e8a338c2112939b6b808fe8a213fafdcad951731b45902d9a2a2807b03
-DIST kig-19.12.2.tar.xz 3501276 BLAKE2B 75d7f5e827ae38338e32e0d023012305c77ae5195696ab3a55841e377195c5fd0a7653f8708e4208dfba63c9408f48719d3e97827df70f2871f28f352a73906c SHA512 3f091e85d61b5889183097201161ca9378c1085d947a2819e43dc937e8c9c433ba8fba10d8fea1ff1c20af93bd05f9fc8718a130f8d7e17fcd1ab97726cdb117
-EBUILD kig-19.08.3-r5.ebuild 1804 BLAKE2B d32086148197d0898c871f450f4b8172c3235f13f10dce738aec0975b7cb527b3a081f65d54c22a9053c03deb646895f95180461fe3dec103214744ce88ef442 SHA512 47b99ed2b039af72a2cb2ba4c9722610427bd412bf42291c03d54d47cc41aa7025927524dedcf2fe28745a98cd3314bea33d2910c42c64ee4cde94cd4b922b88
-EBUILD kig-19.08.3-r6.ebuild 1848 BLAKE2B 6c28bafb3ca6b6b9a1ca1565cf21442ad8af0b3bbc304eeebbca3dad85a7d8231c5c5012788d61353e910aa188a2fa66be4a0376da96dee9da23c4cc4b1cec9e SHA512 a1377f012ba12711d2d34a1c5a05654721b0c0bcd7494ce42434888ed9261721120741681f6d924e5c510c486afbbcca523bed4001608128756dab2544c6f7f9
-EBUILD kig-19.12.2-r1.ebuild 1823 BLAKE2B 16cbcb008e068f47a52f0ee7b3d6d9a1e74b11b11a2345fdb61a307022afa15b848528d994e56e0e214016f1ddb16c438320fa3d898f69ee8e650cb04910fc74 SHA512 2fa9a2c5263d5f0470bd3eebba362a283da4af1af87ee4c8a43aaf8538d34d20331361eb15a1f1e456fa323c66e6f761512a635645a6f2b54402f8c53709fc2e
+DIST kig-19.12.3.tar.xz 3500260 BLAKE2B 45ae92dae8927201f8a11f4c2087143e3301a4aef4d6e263644aab130957e5f98d334dc3ea65208783f587235fe217b4e03fa351232e469296b0c9e38b69430b SHA512 554b70c1ec7e62b52bdfb736cf17d685df68ffee00ebd4253e838f753e274c275a5df774f37240b2cb4778bfdc16b28c37f087772e61c82409397e92982e4109
+EBUILD kig-19.12.3.ebuild 1820 BLAKE2B fc22c6cb1a143e8dcacd818a797ae4745c34d68f2a243aeca298ffcd633dee0a01d7972b30cdfb8b72b57e672c63dfa356a6cbf48dda5782045174dc41290019 SHA512 bb8f50e1a182f7dc47969cc5e14a4cf1047f6a9f510ed6192084f961d1b196ba3f58fced247d0089afa133d9ed7c5e402c3d35109bcb4bffeaa9694de4c7f886
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch b/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch
deleted file mode 100644
index 19c5f9535a1c..000000000000
--- a/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e0dae6b9938963c8f3c30ac7b8182452645e2dbf Mon Sep 17 00:00:00 2001
-From: Yuri Chornoivan <yurchor@ukr.net>
-Date: Tue, 22 Oct 2019 20:42:51 +0300
-Subject: Try to fix Python 3 build
-
----
- scripting/python_scripter.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc
-index e60a90c..62a7409 100644
---- a/scripting/python_scripter.cc
-+++ b/scripting/python_scripter.cc
-@@ -390,7 +390,11 @@ PythonScripter::PythonScripter()
-   // the newstring stuff is to prevent warnings about conversion from
-   // const char* to char*..
-   char* s = newstring( "kig" );
-+#if PY_VERSION_HEX >= 0x03000000
-+  PyImport_AppendInittab( s, PyInit_kig );
-+#else
-   PyImport_AppendInittab( s, initkig );
-+#endif
-   //  we can't delete this yet, since python keeps a pointer to it..
-   // This means we have a small but harmless memory leak here, but it
-   // doesn't hurt at all, since it could only be freed at the end of
--- 
-cgit v1.1
diff --git a/kde-apps/kig/kig-19.08.3-r5.ebuild b/kde-apps/kig/kig-19.08.3-r5.ebuild
deleted file mode 100644
index ccc05e430170..000000000000
--- a/kde-apps/kig/kig-19.08.3-r5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{6,7} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kig
-https://edu.kde.org/kig/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
-	scripting? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.48:=[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
-	"${FILESDIR}"/${P}-scripter-python3.patch
-	"${FILESDIR}"/${P}-pykig-python3.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake_use_find_package scripting BoostPython)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kig/kig-19.08.3-r6.ebuild b/kde-apps/kig/kig-19.08.3-r6.ebuild
deleted file mode 100644
index f49f65563ac0..000000000000
--- a/kde-apps/kig/kig-19.08.3-r6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{6,7} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kig
-https://edu.kde.org/kig/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
-	scripting? (
-		$(python_gen_cond_dep '
-			>=dev-libs/boost-1.48:=[python,${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
-	"${FILESDIR}"/${P}-scripter-python3.patch
-	"${FILESDIR}"/${P}-scripter-crash.patch
-	"${FILESDIR}"/${P}-pykig-python3.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake_use_find_package scripting BoostPython)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kig/kig-19.12.2-r1.ebuild b/kde-apps/kig/kig-19.12.3.ebuild
index 533020b39d28..02a8c7729269 100644
--- a/kde-apps/kig/kig-19.12.2-r1.ebuild
+++ b/kde-apps/kig/kig-19.12.3.ebuild
@@ -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}"