gentoo resync : 18.11.2019

3 files changed, 68 insertions, 64 deletions

diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 4f63cb957fec..ab8a42b6c61f 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,6 @@
 AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f
 DIST kig-19.04.3.tar.xz 3492840 BLAKE2B 3abfbc6d5278fda490a6211b545d431430ef7ae039237ed4f138b74ffb835f4e8a18b843463d8f016832d948b728894178130ce39adadb53a29ceb09c0932da6 SHA512 ade87a3138e017a954fb9a7610e3032e61bf0b275973b5cba2ee0c254abf0d86446a4663e288cfb8bb294f69edbbf80a9993f3eca52f845edec5462f440e4624
-DIST kig-19.08.2.tar.xz 3501052 BLAKE2B 73409cc17419228844a60928b614ed5511562219fc19577ea4a5686c7fb0a2a100ca2dd8318f69de21e1162133a5420bb0b920e116773e0bd9ac03d22b35db7d SHA512 643fa3c0a737420ce269f1c191cba75b6f15576c72b43fdabe74d6a2196eeb099071bfa94cf61174e7e41945cd8785c8198aba36cd7878ec9b5b82b3cfcc80f1
+DIST kig-19.08.3.tar.xz 3497128 BLAKE2B e6611dd70ef47d0c710b5127b01532da4dc0841dbbfd8a151a9a867970389aa3c46d74a1347504beef5ca3c6fbcfaf2521923d7e34306eba580d88ecf002b1f8 SHA512 7e5f315695e9678c3e95822da3e86328dd8d6521d83697c623ac0175ae96fe13490d39e8a338c2112939b6b808fe8a213fafdcad951731b45902d9a2a2807b03
 EBUILD kig-19.04.3.ebuild 1495 BLAKE2B 954d2408a18fafa3d50a814e224dc585d6351ab0fb3adcedc1038db0760f32aa4a91b9e925e7171d34eafe60a8ae5da515398ddcf18dc73432057f7907b152a1 SHA512 1f3b3257dcd611992776e3701767a56abcd9f45b8875d7c66ed429cb3fc4e09073439c2fd90180efc5f2b9d0a06d310a957f932416d33ba169ac55bd2c7f9184
-EBUILD kig-19.08.2.ebuild 1498 BLAKE2B e5207a33e7351cd6fa743de151958fe75ae6a17a18be290dcec037f12ffcfb90c7db8eca51cbed8f694a8925a7370816236ad61556b8a7cec1e5aa8276afbcab SHA512 54d56609c5ade18e3b02c258d11be3532a56fa49fb665d0849bdf440350f6aed95f270f2c5152ccb0cf4ce97c2b4e786933d3303019c5d214b18edea9486c9f9
+EBUILD kig-19.08.3.ebuild 1681 BLAKE2B dc2d2295510a43497e19fde8f6e0ca17d675de327fa1742300c2eb1d20f006763f0ad64ec91e0b4227d84bf06c9bd8c3226158f3cb6a6aa2da09fe2e65380c90 SHA512 313d2e1e2fdb8037713049765894e6e8ec7c476e9244d4ffec1d80713cbcb206ec1c00e68cfc4f655055cce7bac86de915658fad4e12d23018bf3959515b663c
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-19.08.2.ebuild b/kde-apps/kig/kig-19.08.2.ebuild
deleted file mode 100644
index ffc402647785..000000000000
--- a/kde-apps/kig/kig-19.08.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 kde5
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://kde.org/applications/education/kig https://edu.kde.org/kig/"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	geogebra? ( $(add_qt_dep qtxmlpatterns) )
-	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ktexteditor)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake-utils_use_find_package scripting BoostPython)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kig/kig-19.08.3.ebuild b/kde-apps/kig/kig-19.08.3.ebuild
new file mode 100644
index 000000000000..3563fa63f20b
--- /dev/null
+++ b/kde-apps/kig/kig-19.08.3.ebuild
@@ -0,0 +1,66 @@
+# 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
+}