commit: c44ecf806e4e55fabb78b71a6e0caf8e8802ef2a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Aug 20 20:36:44 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@ <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> - <use> - <flag name="activities">Enable Plasma Activities support via <pkg>kde-frameworks/kactivities</pkg></flag> - </use> </pkgmetadata>
