From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 14DE415827B for ; Mon, 25 Aug 2025 18:54:42 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 00BF83410EC for ; Mon, 25 Aug 2025 18:54:42 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 239F8110564; Mon, 25 Aug 2025 18:54:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 15E66110563 for ; Mon, 25 Aug 2025 18:54:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B34E834102D for ; Mon, 25 Aug 2025 18:54:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 233F534C2 for ; Mon, 25 Aug 2025 18:54:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1756148046.761c76f8a2fd32cc20f568810fcd91a63c5aeb05.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kig/, kde-apps/kig/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/kig/Manifest kde-apps/kig/files/kig-25.07.80-cmake-boostpython.patch kde-apps/kig/kig-25.07.90.ebuild X-VCS-Directories: kde-apps/kig/files/ kde-apps/kig/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 761c76f8a2fd32cc20f568810fcd91a63c5aeb05 X-VCS-Branch: master Date: Mon, 25 Aug 2025 18:54:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a9458f60-28e4-4db8-9fff-ac05acdf1c28 X-Archives-Hash: 29c6b40691c9c4b52045313f29312432 commit: 761c76f8a2fd32cc20f568810fcd91a63c5aeb05 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Aug 25 18:51:32 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Aug 25 18:54:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761c76f8 kde-apps/kig: drop 25.07.90 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kig/Manifest | 1 - .../kig/files/kig-25.07.80-cmake-boostpython.patch | 79 ---------------------- kde-apps/kig/kig-25.07.90.ebuild | 62 ----------------- 3 files changed, 142 deletions(-) diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest index c605d269871f..a1f98dc155c3 100644 --- a/kde-apps/kig/Manifest +++ b/kde-apps/kig/Manifest @@ -1,3 +1,2 @@ DIST kig-25.07.70_p20250610-e962bde7.tar.gz 4793685 BLAKE2B 0a90daf63ca2032b2a7c4bcdf0173b059dba00bc7798960f432226600570119ede53e4094366662b22c7d985e51637ebb795dcf1a86fd09a2b7a7f58ca378d18 SHA512 365f694672cc5bb8af43cdf63286880be4366ab5f5b6cc10f99346340ef324d74782eb84655a4bb6d10eddffe904883af3fd78101e26818d7cd0a34c9c2cc7f9 -DIST kig-25.07.90.tar.xz 3258132 BLAKE2B 597b6e9b8f8866ba2acce44eeb8db4e02070a8bded5b9c53d67c668e8c3e37d5bdb68df9ed7c5954ba9032157ecfdfa0bf639cad52f476ae311bc803a8b302d6 SHA512 576f73b03e8c65978abe63a8e319f20e18e4084df275f2203044acc65c31fc8070645b2ac18377b8ca0e2aaa625a064fedc349911de854e4a811125902819c32 DIST kig-25.08.0.tar.xz 3259640 BLAKE2B 7ecceb979dc9e1b8963c4e45629fcff3922164bf50ace42958c068fef4288279783f53df342f8c5df34c2fb95cdf6008866f7fe0dd44ae82cd145b8169943cac SHA512 669fa11aacb9fb5adf5a9bb78cbbe6cab2a8b7ca8ffccb9cd182cb1b5c36b3f918b5e7d4606dc9c61f391fb75f397903caf73eeccf5718239a3a7a7cf9c44425 diff --git a/kde-apps/kig/files/kig-25.07.80-cmake-boostpython.patch b/kde-apps/kig/files/kig-25.07.80-cmake-boostpython.patch deleted file mode 100644 index 87e017d0e5bb..000000000000 --- a/kde-apps/kig/files/kig-25.07.80-cmake-boostpython.patch +++ /dev/null @@ -1,79 +0,0 @@ -From c656b9ce0d8727302fea126d2ad70c36ce99f9e8 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -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 ---- - CMakeLists.txt | 20 +++++++++----------- - 1 file changed, 9 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d05dae46..1c792102 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -55,7 +55,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}) - - if(KF6DocTools_FOUND) - add_subdirectory( doc ) -@@ -67,15 +68,15 @@ add_subdirectory( mimetypes ) - add_subdirectory( macros ) - 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() - - 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" - ) -@@ -93,9 +94,6 @@ endif() - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) - - include_directories( ${CMAKE_SOURCE_DIR}/modes ) --if(BoostPython_FOUND) -- include_directories(${BoostPython_INCLUDE_DIRS}) --endif() - - # kigpart - -@@ -345,7 +343,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 -@@ -376,8 +374,8 @@ target_link_libraries(kigpart - KF6::Archive - ) - --if(BoostPython_FOUND) -- target_link_libraries(kigpart ${BoostPython_LIBRARIES} KF6::TextEditor) -+if(Boost_FOUND) -+ target_link_libraries(kigpart Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR} ${PYTHON_LIBRARIES} KF6::TextEditor) - endif() - - if (Qt${QT_MAJOR_VERSION}XmlPatterns_FOUND) --- -2.50.1 - diff --git a/kde-apps/kig/kig-25.07.90.ebuild b/kde-apps/kig/kig-25.07.90.ebuild deleted file mode 100644 index 40c46477de4c..000000000000 --- a/kde-apps/kig/kig-25.07.90.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -PYTHON_COMPAT=( python3_{11..13} ) -KFMIN=6.13.0 -QTMIN=6.8.1 -inherit python-single-r1 ecm gear.kde.org xdg - -DESCRIPTION="KDE Interactive Geometry tool" -HOMEPAGE="https://apps.kde.org/kig/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -IUSE="scripting" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml] - >=dev-qt/qtsvg-${QTMIN}:6 - >=kde-frameworks/karchive-${KFMIN}:6 - >=kde-frameworks/kcompletion-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - scripting? ( - $(python_gen_cond_dep ' - >=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}] - ') - ) -" -DEPEND="${RDEPEND} - >=kde-frameworks/ktexteditor-${KFMIN}:6 -" - -PATCHES=( "${FILESDIR}"/${PN}-25.07.80-cmake-boostpython.patch ) - -src_prepare() { - ecm_src_prepare - python_fix_shebang . -} - -src_configure() { - local mycmakeargs=( - -DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON} - $(cmake_use_find_package scripting Boost) - ) - - ecm_src_configure -}