gentoo resync : 05.02.2020

5 files changed, 6 insertions, 78 deletions

diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index d5ce5c0adf71..9691dfd105fc 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -4,8 +4,7 @@ AUX kig-19.08.3-scripter-python3.patch 981 BLAKE2B 66a23977cbcbfaf7965d1264c1806
 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.1.tar.xz 3501216 BLAKE2B d381c11f14762ccfc8d41752b3905630b078bbdd0922c27da3cf90c7fbf836f613171d8f651652c35e298b3e6676b85aaa2d20783a76b8fa518d2b5e81735274 SHA512 f5c681c1f491f2b6e0d34376b12eb75ed85b7f2d159fba3bf26a3e2b2fee15919e5bbe426e0d4021581a71899853c19a65db4f56263874a2a710b53617260784
-EBUILD kig-19.08.3-r1.ebuild 1765 BLAKE2B ee2b1f5c40158cc55f9adff63ec3fcd925626a316cca5b8f2ca2f6a605c245da1619af097963baa1f1dd56e0f519f5917f4c5bb2d39ea81271809c98a6728f6d SHA512 9dbf74b471ce5b14900d8d2c0b5817fc70934d04411649785df604030125b9c5bd41a761eedf2c69d725df84ea4102dacac5e4e0fd4b408f314dc674b9322d43
-EBUILD kig-19.08.3-r2.ebuild 1809 BLAKE2B 301d02908444b087bbf968133503ae88003d17156dcbff7b50b5bec3cbd2662a3076fb131b8d2c86f3a5834f5b4726c782a8dc347bd823b377cd608a93d6f9ca SHA512 9ce77b6589f40a5e02e912a50c57e14dd8d85d45139f603e719c6419ca5bdc1b32e5f50bdcd2b5f9d5591424ff99d8794ec645aa071995e9451929d077c34bb1
-EBUILD kig-19.12.1-r1.ebuild 1784 BLAKE2B 7511cfee58b924af29572996a42cdd73f0d2e107fba2a11f512c03594895b1f338670c47c3d99ec3bdd0b04ae2d040371b359e2c54a15c9f5cb3613e8333d950 SHA512 3407cb06861f321f12a9119a7be4335c8870156d89a2f744714c123e05dd44d3cbed20b82e45c82b61da41398001488ce77c9ab757a73dab4c0ed80b15cfe1be
-EBUILD kig-19.12.1.ebuild 1734 BLAKE2B 3c8392669eee83c11286e2219f907d0be7043dde2f506385b964fdd7cab21a150a02f3a810655cb77f562f41b95e834085048bf1f34e6b25603525910d120be9 SHA512 1396c38819faf25c79964f88ba7fb2da4f06d7c5f1d31795d96c632a8416ffc23de5fe4dc9a93692b8f84bbab0dd73aa0a1558321d135c2fe59a784dda55dc56
+EBUILD kig-19.08.3-r3.ebuild 1763 BLAKE2B 1955248b25c049868dea1677859e34e78d39c5867f5f6c52d6b1fbee939427ba4d017ccd24abd1ed6d04359cd1a792c01acd15230cafeb43dc3612e0d4ffe392 SHA512 771dbc5c54c6486297699f76117b217f14cc36bafe4a90dcc1adf02c0e2e78cc0b2416398339e00da16797005379413676ed0786cb6677410e2eb44967bae69a
+EBUILD kig-19.08.3-r4.ebuild 1807 BLAKE2B cc89c22f6c1e2d7d286810b8ef43ad28e27ba3fb802c69b209a6ecdd8449e789cd6b05f59e5499eb22c84d516413bd0a677e3e839b5c2ed3d796a95d3487d519 SHA512 bc95dcd38326cc8bba20b31d1e6f97bc83b20de3cc691b0d9ff3557d53ffc339cdd65b5f385b0f3e70b2323d95b53fb5c960301a2b7f7d7b37d5ff2b96875fdf
+EBUILD kig-19.12.1-r3.ebuild 1782 BLAKE2B 012c9032a3d852ae86be2be7e4ee0237d90bc1b7b5ea8cd392bef85ca79f4d72614573d0bdff26db7be7ae8e73a3a541d1c1433a2f5a353b6489e931e92c034d SHA512 e4842cfdf4188bd5a0d2a220382f66c8953479af9d739bf24a07cdb8b1eea7de12aaebf5e4515b881c29816dc4902cffd66985f294560d4edd0c4c3d602bd8e9
 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-r3.ebuild
index ad13d7a384ed..314539d6f4a7 100644
--- a/kde-apps/kig/kig-19.08.3-r1.ebuild
+++ b/kde-apps/kig/kig-19.08.3-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7} )
 KFMIN=5.60.0
 QTMIN=5.12.3
 inherit python-single-r1 ecm kde.org
diff --git a/kde-apps/kig/kig-19.08.3-r2.ebuild b/kde-apps/kig/kig-19.08.3-r4.ebuild
index e6f4820bb303..79baaa3c251a 100644
--- a/kde-apps/kig/kig-19.08.3-r2.ebuild
+++ b/kde-apps/kig/kig-19.08.3-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7} )
 KFMIN=5.60.0
 QTMIN=5.12.3
 inherit python-single-r1 ecm kde.org
diff --git a/kde-apps/kig/kig-19.12.1-r1.ebuild b/kde-apps/kig/kig-19.12.1-r3.ebuild
index 97c83d4330f9..a145b7e7a8bb 100644
--- a/kde-apps/kig/kig-19.12.1-r1.ebuild
+++ b/kde-apps/kig/kig-19.12.1-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7} )
 KFMIN=5.63.0
 QTMIN=5.12.3
 inherit python-single-r1 ecm kde.org
diff --git a/kde-apps/kig/kig-19.12.1.ebuild b/kde-apps/kig/kig-19.12.1.ebuild
deleted file mode 100644
index 1856492b32bf..000000000000
--- a/kde-apps/kig/kig-19.12.1.ebuild
+++ /dev/null
@@ -1,71 +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,8} )
-KFMIN=5.63.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? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
-	"${FILESDIR}"/${PN}-19.08.3-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
-}