gentoo resync : 25.11.2020

4 files changed, 7 insertions, 100 deletions

diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 844d782836d1..d6f6b58d0e2b 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,7 +1,4 @@
 AUX kig-20.08.70-cmake-boostpython.patch 2660 BLAKE2B 51c473dd8733f44214571772b2249abe730087648d962ebab12faacaebaa2e1bb0788220faf2a03b110477a1112fce771d1b269d03e3a05670a35ffe02c82c86 SHA512 0abd06e611f90a8f73ecf5599377df45ae350c4352ff5c0cac47918d4938142bce9677a0430aa3aaf8d6f0edd5241f4751fc2187410b7287dd399caef6c8e7ec
-AUX kig-4.12.0-boostpython.patch 1014 BLAKE2B f860ac552eb6e50040ce7cdcb2891e246a64fa69002790015774ff2080fc6b7e850fdacc775d65ed79fc32e97e57304dcbb149f5089a8ecf981989f0894feb36 SHA512 fb9e9269fc4af850635eb88f5a97f2c61d7419fbaeff4bef0ed9d4ebf410c4cd02ab70733c3f1d0b08444e1a878fa74a9d691268f30c339b7855506e56c34fa8
-DIST kig-20.04.3.tar.xz 3482876 BLAKE2B d56c3c03f1c90df991377ed1cf43fa734fd5d295e755af6833508540f6796b079025c1ea5eebbf6719a08bc2bec2a3f716e9d2d40bb7038b096941d357285343 SHA512 64d806c901387dfeaf799ededa22ffd6a2471025d6e3f91940e1f70c3619b86b8427aa1dd97bd59780083173d6e8951205cd8385714682131d45724d72efd963
-DIST kig-20.08.1.tar.xz 3490284 BLAKE2B 86f9ab6743fb92fcc4ffda26d435df8f2478875b8065bf84eb724c9e6e59daee3dee9a1f247c1547cbf9cf9adde7be89d856376064d9f5f98def8624da38eddc SHA512 2fa0b0ebf88159d8df8cc4d02264680d2fbe81f7c6fd7a177ac6784a8c6348b00843d09a3ac88eab6f8a9817129fff9e57ab5aa906e1a34b1981687cdcfe3d9e
-EBUILD kig-20.04.3.ebuild 1720 BLAKE2B b0a48bb08473bbb7f43341ee8ea86908a994d82762b77a0996b3df8f65c14740651019d9f3882395bdaee99213b8e1e3f4fdc72f5e4cbe1a6c2741e8f4e59dbd SHA512 daf6fef631f30e2f79af6db5e6517cab96d2f4219ce89b083e3746086dfc22882828c2462c24e497c6036311e47c2e9ba48705a2cc70a6215d3461ecc92ac67f
-EBUILD kig-20.08.1.ebuild 1772 BLAKE2B b3c8d6fc3df5b22a64b6ffd6615be83eb561ffba2f8cba17f7de98e8d681d056bc622028aac5c85b003be1055e89d0bc6c9de3be47bac50b244a9e83030fb156 SHA512 e8e3879d20a484af5bd47bc1862668195b385136f5d60d1974faff2410286d5c77fb427f79690921b0c5dad9e9d2f5af47989eaf818bcd6e81d6c6238b4d1580
+DIST kig-20.08.3.tar.xz 3467000 BLAKE2B 98b103707fa38c2d840a2b2c2fe3a9892e75fc0bd49367d514d33e1d04fef6379bce502d7f75bce29da13951ed79ee44e55700725506d81b220a624610ebae44 SHA512 becd24e67af434cda18ca7d483ace8649446273ca62eaf12618d5012bed1220e175de5841912075d67a54d777ff1a015a27d56ef53f12bb03c03d2c91e3bdf3f
+EBUILD kig-20.08.3.ebuild 1748 BLAKE2B 55c839cd02d4e2a77be9292895187e2c5f1bed48b879725cfd46e8a5b824c379ab1ca7b8b4b43692cf429d95f57e1d3131f15ffd787e23b74aabc404149c523e SHA512 e800c977a7cb640c683d71958b04a8e1ca9e46ce02f8d103ebfba8714b78b0f12b9caea5e5d03d2797c2ad75aceaebf81fe2682193b5f727cf4bb5f4022b8b17
 MISC metadata.xml 417 BLAKE2B e9b8762ae43f4e8e449b2a649d89d6e909bd34529bffaf6b0c4683a927b5b89486e7b94de5a34bebe5ceb580289b0ffbead4d3f8db19d0c79f95a93126b17f51 SHA512 9a87c6e27600a5bad58df8fc2de4696a6e2a81e1474cae08201e4861d7961537eba510463e3522ff0bf7a1bcdb77aa84804f0fb956e0d0cf096ffd8f523f1ace
diff --git a/kde-apps/kig/files/kig-4.12.0-boostpython.patch b/kde-apps/kig/files/kig-4.12.0-boostpython.patch
deleted file mode 100644
index c9ca1b2f9d06..000000000000
--- a/kde-apps/kig/files/kig-4.12.0-boostpython.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake

-index 2ccc161..02d9bf6 100644

---- a/cmake/modules/FindBoostPython.cmake

-+++ b/cmake/modules/FindBoostPython.cmake

-@@ -74,10 +74,10 @@ if(HAVE_BOOST_SHARED_PTR_HPP AND Boost_PYTHON_FOUND)

-     # Second try: try pkg-config way

-     find_package(PkgConfig)

-     if(PKG_CONFIG_FOUND)

--      set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2")

-+      execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE PYTHON_VERSIONS)

-       foreach(_pyver ${PYTHON_VERSIONS})

-         if(NOT BoostPython_INCLUDES OR NOT BoostPython_LIBS)

--          pkg_check_modules(${_pyver} QUIET ${_pyver})

-+         pkg_check_modules(_python python-${_pyver})

-           if(${_pyver}_FOUND)

-             cmake_push_check_state()

-             set(CMAKE_REQUIRED_INCLUDES  ${CMAKE_REQUIRED_INCLUDES}  ${${_pyver}_INCLUDE_DIRS})

diff --git a/kde-apps/kig/kig-20.04.3.ebuild b/kde-apps/kig/kig-20.04.3.ebuild
deleted file mode 100644
index 7bd792799824..000000000000
--- a/kde-apps/kig/kig-20.04.3.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_{7,8} )
-KFMIN=5.70.0
-QTMIN=5.14.2
-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 )
-
-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-20.08.1.ebuild b/kde-apps/kig/kig-20.08.3.ebuild
index 582156bfe01a..aff614b5b0e7 100644
--- a/kde-apps/kig/kig-20.08.1.ebuild
+++ b/kde-apps/kig/kig-20.08.3.ebuild
@@ -5,18 +5,17 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_{7,8} )
-KFMIN=5.72.0
-QTMIN=5.14.2
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
 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/"
+HOMEPAGE="https://apps.kde.org/en/kig 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}"