From 9608faf712d38e90d857f5b44c0b2f2ed6aedabc Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 7 Feb 2020 15:56:24 +0100
Subject: kde-apps/kig: Switch to PYTHON_MULTI_USEDEP API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 kde-apps/kig/kig-19.08.3-r3.ebuild | 72 -----------------------------------
 kde-apps/kig/kig-19.08.3-r4.ebuild | 73 ------------------------------------
 kde-apps/kig/kig-19.08.3-r5.ebuild | 76 +++++++++++++++++++++++++++++++++++++
 kde-apps/kig/kig-19.08.3-r6.ebuild | 77 ++++++++++++++++++++++++++++++++++++++
 kde-apps/kig/kig-19.12.2-r1.ebuild | 76 +++++++++++++++++++++++++++++++++++++
 kde-apps/kig/kig-19.12.2.ebuild    | 72 -----------------------------------
 6 files changed, 229 insertions(+), 217 deletions(-)
 delete mode 100644 kde-apps/kig/kig-19.08.3-r3.ebuild
 delete mode 100644 kde-apps/kig/kig-19.08.3-r4.ebuild
 create mode 100644 kde-apps/kig/kig-19.08.3-r5.ebuild
 create mode 100644 kde-apps/kig/kig-19.08.3-r6.ebuild
 create mode 100644 kde-apps/kig/kig-19.12.2-r1.ebuild
 delete mode 100644 kde-apps/kig/kig-19.12.2.ebuild

diff --git a/kde-apps/kig/kig-19.08.3-r3.ebuild b/kde-apps/kig/kig-19.08.3-r3.ebuild
deleted file mode 100644
index 314539d6f4a7..000000000000
--- a/kde-apps/kig/kig-19.08.3-r3.ebuild
+++ /dev/null
@@ -1,72 +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? ( >=dev-libs/boost-1.48:=[python,${PYTHON_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-r4.ebuild b/kde-apps/kig/kig-19.08.3-r4.ebuild
deleted file mode 100644
index 79baaa3c251a..000000000000
--- a/kde-apps/kig/kig-19.08.3-r4.ebuild
+++ /dev/null
@@ -1,73 +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? ( >=dev-libs/boost-1.48:=[python,${PYTHON_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.08.3-r5.ebuild b/kde-apps/kig/kig-19.08.3-r5.ebuild
new file mode 100644
index 000000000000..ccc05e430170
--- /dev/null
+++ b/kde-apps/kig/kig-19.08.3-r5.ebuild
@@ -0,0 +1,76 @@
+# 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
new file mode 100644
index 000000000000..f49f65563ac0
--- /dev/null
+++ b/kde-apps/kig/kig-19.08.3-r6.ebuild
@@ -0,0 +1,77 @@
+# 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.2-r1.ebuild
new file mode 100644
index 000000000000..533020b39d28
--- /dev/null
+++ b/kde-apps/kig/kig-19.12.2-r1.ebuild
@@ -0,0 +1,76 @@
+# 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.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? (
+		$(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}"/${PN}-19.08.3-pykig-python3.patch
+	"${FILESDIR}"/${PN}-19.08.3-scripter-crash.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.ebuild b/kde-apps/kig/kig-19.12.2.ebuild
deleted file mode 100644
index a145b7e7a8bb..000000000000
--- a/kde-apps/kig/kig-19.12.2.ebuild
+++ /dev/null
@@ -1,72 +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.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
-	"${FILESDIR}"/${PN}-19.08.3-scripter-crash.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
-}
-- 
cgit v1.2.3-65-gdbad