commit: b2e04218b25e44264b4bd4503e01a1ca60d8a0b5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 13 10:01:36 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 13 12:24:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e04218
kde-apps/kig: drop 25.04.0 Bug: https://bugs.gentoo.org/959740 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/kig/Manifest | 1 - .../kig/files/kig-20.08.70-cmake-boostpython.patch | 91 ---------------------- kde-apps/kig/kig-25.04.0.ebuild | 72 ----------------- kde-apps/kig/metadata.xml | 2 +- 4 files changed, 1 insertion(+), 165 deletions(-) diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest index abbfa4713e02..d8e9d58de300 100644 --- a/kde-apps/kig/Manifest +++ b/kde-apps/kig/Manifest @@ -1,2 +1 @@ -DIST kig-25.04.0.tar.xz 3253632 BLAKE2B f721c103bff1e3dd45e465bcc778c657b9327346dc6ec65161064d3fd60a834a867eba5e510bd8ba44e899447dbb97894a2670f224422c1a948339c28db3f342 SHA512 7431d495646645ea5ce2a8eb4eff169d017c62c865bc9fbd73762a501f183f3a288d0d7d504a00be2fd48e69a755c43b892205c42723a724ca4295cf0e369b32 DIST kig-25.07.70_p20250610-e962bde7.tar.gz 4793685 BLAKE2B 0a90daf63ca2032b2a7c4bcdf0173b059dba00bc7798960f432226600570119ede53e4094366662b22c7d985e51637ebb795dcf1a86fd09a2b7a7f58ca378d18 SHA512 365f694672cc5bb8af43cdf63286880be4366ab5f5b6cc10f99346340ef324d74782eb84655a4bb6d10eddffe904883af3fd78101e26818d7cd0a34c9c2cc7f9 diff --git a/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch b/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch deleted file mode 100644 index bd0c13ad3772..000000000000 --- a/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 39bf05d48f899612dffa07c73ac276f52820a7c9 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Mon, 13 Jul 2020 00:41:25 +0200 -Subject: [PATCH] Use CMake's own FindBoost module to detect Boost Python - -Introduces BOOSTPYTHON_VERSION_MAJOR_MINOR for packaging. - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 26 ++++++++++++-------------- - 1 file changed, 12 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e65585fb..e07a4dc6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,7 +51,8 @@ endif() - - include(KigConfigureChecks.cmake) - --find_package(BoostPython) -+set(BOOSTPYTHON_VERSION_MAJOR_MINOR python37 CACHE STRING "Version of BoostPython to feed CMake's FindBoost") -+find_package(Boost 1.70 COMPONENTS ${BOOSTPYTHON_VERSION_MAJOR_MINOR}) - - add_subdirectory( doc ) - add_subdirectory( icons ) -@@ -61,15 +62,15 @@ add_subdirectory( macros ) - add_subdirectory( data ) - add_subdirectory( pykig ) - --if(BoostPython_FOUND) -+if(Boost_FOUND) -+ find_package(PythonLibs 3 REQUIRED) -+ include_directories(${PYTHON_INCLUDE_DIRS}) - add_subdirectory( scripting ) - add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING) --endif(BoostPython_FOUND) -+endif() - - set_package_properties( -- BoostPython PROPERTIES -- DESCRIPTION "Python scripting support in Boost" -- URL "https://www.boost.org/"; -+ Boost PROPERTIES - TYPE OPTIONAL - PURPOSE "Kig can optionally use Boost.Python for Python scripting" - ) -@@ -85,9 +86,6 @@ set_package_properties( - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) - - include_directories( ${CMAKE_SOURCE_DIR}/modes ) --if(BoostPython_FOUND) -- include_directories(${BoostPython_INCLUDE_DIRS}) --endif(BoostPython_FOUND) - - # kigpart - -@@ -225,7 +223,7 @@ ki18n_wrap_ui(kigpart_PART_SRCS - misc/kigcoordinateprecisiondialog.ui - ) - --if(BoostPython_FOUND) -+if(Boost_FOUND) - set(kigpart_PART_SRCS ${kigpart_PART_SRCS} - modes/popup/scriptactionsprovider.cc - scripting/newscriptwizard.cc -@@ -236,7 +234,7 @@ if(BoostPython_FOUND) - ) - - kde_source_files_enable_exceptions(scripting/python_scripter.cc) --endif(BoostPython_FOUND) -+endif() - - - add_library(kigpart MODULE ${kigpart_PART_SRCS}) -@@ -256,9 +254,9 @@ target_link_libraries(kigpart - ${KDE5_KUTILS_LIBS} - ) - --if(BoostPython_FOUND) -- target_link_libraries(kigpart ${BoostPython_LIBRARIES} ${KDE5_KTEXTEDITOR_LIBS}) --endif(BoostPython_FOUND) -+if(Boost_FOUND) -+ target_link_libraries(kigpart Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR} ${PYTHON_LIBRARIES}) -+endif() - - if (Qt5XmlPatterns_FOUND) - target_link_libraries(kigpart Qt5::XmlPatterns) --- -2.27.0 - diff --git a/kde-apps/kig/kig-25.04.0.ebuild b/kde-apps/kig/kig-25.04.0.ebuild deleted file mode 100644 index 87543f04b25d..000000000000 --- a/kde-apps/kig/kig-25.04.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -PYTHON_COMPAT=( python3_{10..13} ) -KFMIN=5.115.0 -QTMIN=5.15.12 -inherit python-single-r1 ecm gear.kde.org - -DESCRIPTION="KDE Interactive Geometry tool" -HOMEPAGE="https://apps.kde.org/kig/"; - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~riscv ~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.70:=[python,${PYTHON_USEDEP}] - ') - ) -" -DEPEND="${RDEPEND} - >=kde-frameworks/ktexteditor-${KFMIN}:5 -" - -PATCHES=( "${FILESDIR}"/${PN}-20.08.70-cmake-boostpython.patch ) - -pkg_setup() { - python-single-r1_pkg_setup - ecm_pkg_setup -} - -src_prepare() { - ecm_src_prepare - python_fix_shebang . -} - -src_configure() { - local mycmakeargs=( - -DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON} - $(cmake_use_find_package geogebra Qt5XmlPatterns) - $(cmake_use_find_package scripting Boost) - ) - - ecm_src_configure -} diff --git a/kde-apps/kig/metadata.xml b/kde-apps/kig/metadata.xml index 58e61d56d034..237c2690e213 100644 --- a/kde-apps/kig/metadata.xml +++ b/kde-apps/kig/metadata.xml @@ -10,7 +10,7 @@ <remote-id type="kde-invent">education/kig</remote-id> </upstream> <use> - <flag name="geogebra">Support files created by <pkg>sci-mathematics/geogebra-bin</pkg></flag> +<!-- <flag name="geogebra">Support files created by <pkg>sci-mathematics/geogebra-bin</pkg></flag> --> <flag name="scripting">Support Python scripting</flag> </use> </pkgmetadata>
