gentoo resync : 15.01.2020

4 files changed, 6 insertions, 73 deletions

diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index ac1180b81d01..075e6fba9e8a 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -2,8 +2,7 @@ AUX kig-19.08.3-pykig-python3.patch 4617 BLAKE2B 6c10c34462ef5c0387e35cdfe79aa81
 AUX kig-19.08.3-scripter-python3.patch 981 BLAKE2B 66a23977cbcbfaf7965d1264c1806991c8ab1f7636d7e8da83bc218efb011992f63c43b9b2ebadc5b8c21ce114f6a06c93b7c9a531372ac1abaa608ed9288f30 SHA512 a82612a8cb8e95e2a5e839d27bd27fe0f7942df6cf777ea10653791e26a4175fbdd47981c50ab3d5091831f58555c5b3dba94b4b383a916b21482176377bc21c
 AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f
 DIST kig-19.08.3.tar.xz 3497128 BLAKE2B e6611dd70ef47d0c710b5127b01532da4dc0841dbbfd8a151a9a867970389aa3c46d74a1347504beef5ca3c6fbcfaf2521923d7e34306eba580d88ecf002b1f8 SHA512 7e5f315695e9678c3e95822da3e86328dd8d6521d83697c623ac0175ae96fe13490d39e8a338c2112939b6b808fe8a213fafdcad951731b45902d9a2a2807b03
-DIST kig-19.12.0.tar.xz 3498676 BLAKE2B 0a8e4778f935e4de3ea005031292b06b998145df66b3a8cd9b873e36288e164938895e81226fa26db3c465dee311fbde19a78414f09faba619beda804486ae9c SHA512 aa48dfce5b0888142f67090526e33e86ee80f146f5ec52b00ca0d4db476fb1898c8d14159e66801c346e50521209466192956f70fb42bc60075633d24437a2d0
-EBUILD kig-19.08.3-r1.ebuild 1768 BLAKE2B 1d3c14170d695952234ed5e172908e0294db851d44519527f24269ceea09af8f6919def36354b40ce59217be6dd150264c7eca2e25cb091b46913557f5967796 SHA512 8323db3f0b5a00147b9e6d79677df5706defcae62e968ed9b88182896349cf1758b87d3d1c95da56a934aa2ed286e53d5d216ab2defe21130ed73aa969f20b95
-EBUILD kig-19.08.3.ebuild 1678 BLAKE2B e14809f96ebfa43a0a335de3e77d54996f6738d427fc56d86de9899f50f40b4ea9121561aaabe992fd944493bf12b823526dca0259a03e6575079cc09de72ea6 SHA512 fb0aafe66dad8fe7575e33da1e77cdaa6bef17a1cdebe64762943a8e13d498158efe5f1795885072c35bd223124ceea7bca2d681b0621521f15baaebff10d184
-EBUILD kig-19.12.0-r1.ebuild 1734 BLAKE2B 491cf7002327d96dee1545ff491e93e5327054ea4e361094e4a066d20d44ebec9a5c407d5b5ddd8b4709c9ccda8022ee3e54973410b069bd4a8f090d8b73497f SHA512 f98cf3f829032e416cbc005a4f280037cdffb67e3e838832e36f6fa3e4381c8a84f4872323c4675ed840a62ad177255200666bff327e07bd9f32f74310b91e0a
+DIST kig-19.12.1.tar.xz 3501216 BLAKE2B d381c11f14762ccfc8d41752b3905630b078bbdd0922c27da3cf90c7fbf836f613171d8f651652c35e298b3e6676b85aaa2d20783a76b8fa518d2b5e81735274 SHA512 f5c681c1f491f2b6e0d34376b12eb75ed85b7f2d159fba3bf26a3e2b2fee15919e5bbe426e0d4021581a71899853c19a65db4f56263874a2a710b53617260784
+EBUILD kig-19.08.3-r1.ebuild 1765 BLAKE2B ee2b1f5c40158cc55f9adff63ec3fcd925626a316cca5b8f2ca2f6a605c245da1619af097963baa1f1dd56e0f519f5917f4c5bb2d39ea81271809c98a6728f6d SHA512 9dbf74b471ce5b14900d8d2c0b5817fc70934d04411649785df604030125b9c5bd41a761eedf2c69d725df84ea4102dacac5e4e0fd4b408f314dc674b9322d43
+EBUILD kig-19.12.1.ebuild 1734 BLAKE2B 3c8392669eee83c11286e2219f907d0be7043dde2f506385b964fdd7cab21a150a02f3a810655cb77f562f41b95e834085048bf1f34e6b25603525910d120be9 SHA512 1396c38819faf25c79964f88ba7fb2da4f06d7c5f1d31795d96c632a8416ffc23de5fe4dc9a93692b8f84bbab0dd73aa0a1558321d135c2fe59a784dda55dc56
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-19.08.3-r1.ebuild b/kde-apps/kig/kig-19.08.3-r1.ebuild
index 3d0c68469d07..ad13d7a384ed 100644
--- a/kde-apps/kig/kig-19.08.3-r1.ebuild
+++ b/kde-apps/kig/kig-19.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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.08.3.ebuild b/kde-apps/kig/kig-19.08.3.ebuild
deleted file mode 100644
index c07c7f5c1d94..000000000000
--- a/kde-apps/kig/kig-19.08.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PYTHON_COMPAT=( python2_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/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}
-	>=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
-	>=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
-	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
-	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake-utils_use_find_package scripting BoostPython)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kig/kig-19.12.0-r1.ebuild b/kde-apps/kig/kig-19.12.1.ebuild
index 44b0902c3a3f..1856492b32bf 100644
--- a/kde-apps/kig/kig-19.12.0-r1.ebuild
+++ b/kde-apps/kig/kig-19.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7