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 B54811584AD for ; Fri, 25 Apr 2025 14:13:04 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 9DC64343086 for ; Fri, 25 Apr 2025 14:13:04 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id EB62A1104B8; Fri, 25 Apr 2025 14:13:00 +0000 (UTC) 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 bobolink.gentoo.org (Postfix) with ESMTPS id E11F31104B8 for ; Fri, 25 Apr 2025 14:13:00 +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 9077C343056 for ; Fri, 25 Apr 2025 14:13:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C91C5159F for ; Fri, 25 Apr 2025 14:12:58 +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: <1745590054.c922f7c7b217fcd870159fe1152bdf9ed9cc8cc8.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/lokalize/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/lokalize/lokalize-25.04.49.9999.ebuild kde-apps/lokalize/lokalize-9999.ebuild X-VCS-Directories: kde-apps/lokalize/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c922f7c7b217fcd870159fe1152bdf9ed9cc8cc8 X-VCS-Branch: master Date: Fri, 25 Apr 2025 14:12:58 +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: bd3ff9ef-c448-47c1-b15f-2066bbd6a1a1 X-Archives-Hash: aa15282a8a3fc8d1dced9f9f02760b5b commit: c922f7c7b217fcd870159fe1152bdf9ed9cc8cc8 Author: Alfred Wingate protonmail com> AuthorDate: Thu Apr 24 07:56:20 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 25 14:07:34 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c922f7c7 kde-apps/lokalize: remove python scripts Upstream commit: aaa29d78a81d2bc08c1d0efe715f819a0329e96e Bug: https://bugs.gentoo.org/952507 Signed-off-by: Alfred Wingate protonmail.com> Part-of: https://github.com/gentoo/kde/pull/1035 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/lokalize/lokalize-25.04.49.9999.ebuild | 20 +++++++------------- kde-apps/lokalize/lokalize-9999.ebuild | 18 +++--------------- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/kde-apps/lokalize/lokalize-25.04.49.9999.ebuild b/kde-apps/lokalize/lokalize-25.04.49.9999.ebuild index aef838285e..b6ef1fed5c 100644 --- a/kde-apps/lokalize/lokalize-25.04.49.9999.ebuild +++ b/kde-apps/lokalize/lokalize-25.04.49.9999.ebuild @@ -5,10 +5,9 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{10..12} ) KFMIN=6.9.0 QTMIN=6.7.2 -inherit python-single-r1 ecm gear.kde.org optfeature xdg +inherit ecm gear.kde.org optfeature xdg DESCRIPTION="Localization tool for KDE software and other free and open source software" HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/" @@ -18,10 +17,9 @@ SLOT="6" KEYWORDS="" IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" # tests are broken, bug 739734 -DEPEND="${PYTHON_DEPS} +DEPEND=" >=app-text/hunspell-1.2.8:= >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets,xml] >=kde-frameworks/kcompletion-${KFMIN}:6 @@ -41,16 +39,12 @@ DEPEND="${PYTHON_DEPS} >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/sonnet-${KFMIN}:6 " -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - dev-python/translate-toolkit[${PYTHON_USEDEP}] - ') -" +RDEPEND="${DEPEND}" -src_install() { - ecm_src_install - rm "${ED}"/usr/share/lokalize/scripts/msgmerge.{py,rc} || die - python_fix_shebang "${ED}"/usr/share/${PN} +src_prepare() { + ecm_src_prepare + # https://invent.kde.org/sdk/lokalize/-/commit/aaa29d78a81d2bc08c1d0efe715f819a0329e96e + cmake_comment_add_subdirectory scripts } pkg_postinst() { diff --git a/kde-apps/lokalize/lokalize-9999.ebuild b/kde-apps/lokalize/lokalize-9999.ebuild index 18dc6a67df..413f5d230f 100644 --- a/kde-apps/lokalize/lokalize-9999.ebuild +++ b/kde-apps/lokalize/lokalize-9999.ebuild @@ -5,10 +5,9 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{10..12} ) KFMIN=6.12.0 QTMIN=6.7.2 -inherit python-single-r1 ecm gear.kde.org optfeature xdg +inherit ecm gear.kde.org optfeature xdg DESCRIPTION="Localization tool for KDE software and other free and open source software" HOMEPAGE="https://apps.kde.org/lokalize/ https://l10n.kde.org/tools/" @@ -18,10 +17,9 @@ SLOT="6" KEYWORDS="" IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" # tests are broken, bug 739734 -DEPEND="${PYTHON_DEPS} +DEPEND=" >=app-text/hunspell-1.2.8:= >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets,xml] >=kde-frameworks/kcompletion-${KFMIN}:6 @@ -41,17 +39,7 @@ DEPEND="${PYTHON_DEPS} >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/sonnet-${KFMIN}:6 " -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - dev-python/translate-toolkit[${PYTHON_USEDEP}] - ') -" - -src_install() { - ecm_src_install - rm "${ED}"/usr/share/lokalize/scripts/msgmerge.{py,rc} || die - python_fix_shebang "${ED}"/usr/share/${PN} -} +RDEPEND="${DEPEND}" pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then