From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C1770158094 for ; Sat, 20 Aug 2022 21:38:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B31CE0886; Sat, 20 Aug 2022 21:38: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 pigeon.gentoo.org (Postfix) with ESMTPS id 75071E087E for ; Sat, 20 Aug 2022 21:38:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 02D7E341092 for ; Sat, 20 Aug 2022 21:37:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB7015B2 for ; Sat, 20 Aug 2022 21:37:55 +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: <1661031433.c44ecf806e4e55fabb78b71a6e0caf8e8802ef2a.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kwrite/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kwrite/kwrite-22.08.0.ebuild kde-apps/kwrite/kwrite-22.08.49.9999.ebuild kde-apps/kwrite/kwrite-9999.ebuild kde-apps/kwrite/metadata.xml X-VCS-Directories: kde-apps/kwrite/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c44ecf806e4e55fabb78b71a6e0caf8e8802ef2a X-VCS-Branch: master Date: Sat, 20 Aug 2022 21:37:55 +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: 367b4990-5c36-4b2f-9486-1290f281ada4 X-Archives-Hash: 14939e0759a700adf738a882eb0ab653 commit: c44ecf806e4e55fabb78b71a6e0caf8e8802ef2a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 20 20:36:44 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 20 21:37:13 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c44ecf80 kde-apps/kwrite: Depend on newly split out kde-apps/kate-lib Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kwrite/kwrite-22.08.0.ebuild | 39 +++++++++++++---------------- kde-apps/kwrite/kwrite-22.08.49.9999.ebuild | 39 +++++++++++++---------------- kde-apps/kwrite/kwrite-9999.ebuild | 39 +++++++++++++---------------- kde-apps/kwrite/metadata.xml | 3 --- 4 files changed, 54 insertions(+), 66 deletions(-) diff --git a/kde-apps/kwrite/kwrite-22.08.0.ebuild b/kde-apps/kwrite/kwrite-22.08.0.ebuild index d48569c60c..aec44c5192 100644 --- a/kde-apps/kwrite/kwrite-22.08.0.ebuild +++ b/kde-apps/kwrite/kwrite-22.08.0.ebuild @@ -7,7 +7,7 @@ KDE_ORG_NAME="kate" ECM_HANDBOOK="optional" KFMIN=5.96.0 QTMIN=5.15.5 -inherit ecm gear.kde.org +inherit ecm flag-o-matic gear.kde.org DESCRIPTION="Simple text editor based on KDE Frameworks" HOMEPAGE="https://apps.kde.org/kwrite/" @@ -15,34 +15,24 @@ HOMEPAGE="https://apps.kde.org/kwrite/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="activities telemetry" +IUSE="" RDEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + ~kde-apps/kate-lib-${PV}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) " -DEPEND="${RDEPEND} - >=kde-frameworks/ktextwidgets-${KFMIN}:5 -" - -PATCHES=( "${FILESDIR}/${KDE_ORG_NAME}-22.07.80-split-build-from-source.patch" ) +DEPEND="${RDEPEND}" src_prepare() { ecm_src_prepare + + # these tests are run in dev-libs/libkate + cmake_run_in apps/lib cmake_comment_add_subdirectory autotests + # delete colliding kate translations if [[ ${KDE_BUILD_TYPE} = release ]]; then find po -type f -name "*po" -and -not -name "kwrite*" -delete || die @@ -52,13 +42,20 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DBUILD_SPLIT_FROM_SOURCE=ON -DBUILD_addons=FALSE -DBUILD_kate=FALSE - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package telemetry KUserFeedback) ) use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE ) + # provided by dev-libs/libkate + append-libs -l/usr/$(get_libdir)/libkateprivate.so.${PV} + ecm_src_configure } + +src_install() { + ecm_src_install + + # provided by dev-libs/libkate + rm -v "${D}"/usr/$(get_libdir)/libkateprivate.so.${PV} || die +} diff --git a/kde-apps/kwrite/kwrite-22.08.49.9999.ebuild b/kde-apps/kwrite/kwrite-22.08.49.9999.ebuild index 90e2ea790f..ca3f152d34 100644 --- a/kde-apps/kwrite/kwrite-22.08.49.9999.ebuild +++ b/kde-apps/kwrite/kwrite-22.08.49.9999.ebuild @@ -7,7 +7,7 @@ KDE_ORG_NAME="kate" ECM_HANDBOOK="optional" KFMIN=5.96.0 QTMIN=5.15.5 -inherit ecm gear.kde.org +inherit ecm flag-o-matic gear.kde.org DESCRIPTION="Simple text editor based on KDE Frameworks" HOMEPAGE="https://apps.kde.org/kwrite/" @@ -15,34 +15,24 @@ HOMEPAGE="https://apps.kde.org/kwrite/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="activities telemetry" +IUSE="" RDEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + ~kde-apps/kate-lib-${PV}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) " -DEPEND="${RDEPEND} - >=kde-frameworks/ktextwidgets-${KFMIN}:5 -" - -PATCHES=( "${FILESDIR}/${KDE_ORG_NAME}-22.07.80-split-build-from-source.patch" ) +DEPEND="${RDEPEND}" src_prepare() { ecm_src_prepare + + # these tests are run in dev-libs/libkate + cmake_run_in apps/lib cmake_comment_add_subdirectory autotests + # delete colliding kate translations if [[ ${KDE_BUILD_TYPE} = release ]]; then find po -type f -name "*po" -and -not -name "kwrite*" -delete || die @@ -52,13 +42,20 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DBUILD_SPLIT_FROM_SOURCE=ON -DBUILD_addons=FALSE -DBUILD_kate=FALSE - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package telemetry KUserFeedback) ) use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE ) + # provided by dev-libs/libkate + append-libs -l/usr/$(get_libdir)/libkateprivate.so.${PV} + ecm_src_configure } + +src_install() { + ecm_src_install + + # provided by dev-libs/libkate + rm -v "${D}"/usr/$(get_libdir)/libkateprivate.so.${PV} || die +} diff --git a/kde-apps/kwrite/kwrite-9999.ebuild b/kde-apps/kwrite/kwrite-9999.ebuild index 90e2ea790f..ca3f152d34 100644 --- a/kde-apps/kwrite/kwrite-9999.ebuild +++ b/kde-apps/kwrite/kwrite-9999.ebuild @@ -7,7 +7,7 @@ KDE_ORG_NAME="kate" ECM_HANDBOOK="optional" KFMIN=5.96.0 QTMIN=5.15.5 -inherit ecm gear.kde.org +inherit ecm flag-o-matic gear.kde.org DESCRIPTION="Simple text editor based on KDE Frameworks" HOMEPAGE="https://apps.kde.org/kwrite/" @@ -15,34 +15,24 @@ HOMEPAGE="https://apps.kde.org/kwrite/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="activities telemetry" +IUSE="" RDEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + ~kde-apps/kate-lib-${PV}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) " -DEPEND="${RDEPEND} - >=kde-frameworks/ktextwidgets-${KFMIN}:5 -" - -PATCHES=( "${FILESDIR}/${KDE_ORG_NAME}-22.07.80-split-build-from-source.patch" ) +DEPEND="${RDEPEND}" src_prepare() { ecm_src_prepare + + # these tests are run in dev-libs/libkate + cmake_run_in apps/lib cmake_comment_add_subdirectory autotests + # delete colliding kate translations if [[ ${KDE_BUILD_TYPE} = release ]]; then find po -type f -name "*po" -and -not -name "kwrite*" -delete || die @@ -52,13 +42,20 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DBUILD_SPLIT_FROM_SOURCE=ON -DBUILD_addons=FALSE -DBUILD_kate=FALSE - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package telemetry KUserFeedback) ) use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE ) + # provided by dev-libs/libkate + append-libs -l/usr/$(get_libdir)/libkateprivate.so.${PV} + ecm_src_configure } + +src_install() { + ecm_src_install + + # provided by dev-libs/libkate + rm -v "${D}"/usr/$(get_libdir)/libkateprivate.so.${PV} || die +} diff --git a/kde-apps/kwrite/metadata.xml b/kde-apps/kwrite/metadata.xml index fdca63ac17..d925f24397 100644 --- a/kde-apps/kwrite/metadata.xml +++ b/kde-apps/kwrite/metadata.xml @@ -8,7 +8,4 @@ https://bugs.kde.org/ - - Enable Plasma Activities support via kde-frameworks/kactivities -