public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kwrite/
Date: Sat, 20 Aug 2022 21:37:55 +0000 (UTC)	[thread overview]
Message-ID: <1661031433.c44ecf806e4e55fabb78b71a6e0caf8e8802ef2a.asturm@gentoo> (raw)

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>


             reply	other threads:[~2022-08-20 21:38 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-20 21:37 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-03-25  0:15 [gentoo-commits] proj/kde:master commit in: kde-apps/kwrite/ Andreas Sturmlechner
2022-10-16 11:42 Andreas Sturmlechner
2022-08-22 18:14 Andreas Sturmlechner
2022-08-21  2:46 Sam James
2021-11-23 12:28 Andreas Sturmlechner
2021-05-12  7:50 Andreas Sturmlechner
2019-11-16 23:18 Andreas Sturmlechner
2019-08-22 14:14 Andreas Sturmlechner
2017-04-08  8:31 Andreas Sturmlechner
2017-04-01 14:50 Andreas Sturmlechner
2015-11-04 18:56 Michael Palimaka
2015-11-04 18:56 Michael Palimaka
2015-09-01 18:06 Michael Palimaka
2015-09-01 17:41 Michael Palimaka
2015-08-26 13:59 Michael Palimaka
2015-08-26 13:59 Michael Palimaka
2015-03-14 12:37 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1661031433.c44ecf806e4e55fabb78b71a6e0caf8e8802ef2a.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox