public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ksirk/
Date: Sun, 25 Feb 2024 18:09:07 +0000 (UTC)	[thread overview]
Message-ID: <1708883926.a542aeb944cdb9fb4b9bab9bb19b44054cb09f64.sam@gentoo> (raw)

commit:     a542aeb944cdb9fb4b9bab9bb19b44054cb09f64
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 17:53:56 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 17:58:46 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a542aeb9

kde-apps/ksirk: refresh deps

* Add USE=xmpp to control Jabber support, which in turn controls both
  qca (upstream commit 75ed627aadb2c59e69ecc2ac30b44b1a91dec0c8), kio
  (upstream commit 705fddb67dc21a742108a7c8a5f1fd4585a72f29), and kwallet
  (upstream commit 4e13d0b050fd612e693182771c5fd0074d2dbe5c).

* Add dev-qt/qt5compat dep for upstream commit 21c2065d752f39bd35f8c9d9e8607add8dead25f.

* phonon->qtmultimedia for upstream commit 270a94ba1ea2f4ee561ed335731fb1c09bcff6a4.

* dbusaddons for upstream commit 9bf585c1926d1ad90f9532c0b63243bc8a6b9012,
  but it didn't make release.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-apps/ksirk/ksirk-24.02.0.ebuild       | 20 +++++++++++++++-----
 kde-apps/ksirk/ksirk-24.02.49.9999.ebuild | 20 +++++++++++++++-----
 kde-apps/ksirk/ksirk-9999.ebuild          | 21 ++++++++++++++++-----
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/kde-apps/ksirk/ksirk-24.02.0.ebuild b/kde-apps/ksirk/ksirk-24.02.0.ebuild
index 080751de0b..90c72e7f94 100644
--- a/kde-apps/ksirk/ksirk-24.02.0.ebuild
+++ b/kde-apps/ksirk/ksirk-24.02.0.ebuild
@@ -15,11 +15,11 @@ HOMEPAGE="https://apps.kde.org/ksirk/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="xmpp"
 
 DEPEND="
-	>=app-crypt/qca-2.3.7:2[qt6]
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=kde-apps/libkdegames-${PVCUT}:6
 	>=kde-frameworks/kcompletion-${KFMIN}:6
@@ -28,12 +28,22 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
 	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6]
 	sys-libs/zlib
+	xmpp? (
+		>=app-crypt/qca-2.3.7:2[qt6]
+		>=kde-frameworks/kio-${KFMIN}:6
+		>=kde-frameworks/kwallet-${KFMIN}:6
+	)
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_JABBER_SUPPORT=$(usex xmpp)
+	)
+
+	ecm_src_configure
+}

diff --git a/kde-apps/ksirk/ksirk-24.02.49.9999.ebuild b/kde-apps/ksirk/ksirk-24.02.49.9999.ebuild
index a48425d7f8..109f0f44ba 100644
--- a/kde-apps/ksirk/ksirk-24.02.49.9999.ebuild
+++ b/kde-apps/ksirk/ksirk-24.02.49.9999.ebuild
@@ -15,11 +15,11 @@ HOMEPAGE="https://apps.kde.org/ksirk/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
 KEYWORDS=""
-IUSE=""
+IUSE="xmpp"
 
 DEPEND="
-	>=app-crypt/qca-2.3.7:2[qt6]
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=kde-apps/libkdegames-${PVCUT}:6
 	>=kde-frameworks/kcompletion-${KFMIN}:6
@@ -28,12 +28,22 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
 	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6]
 	sys-libs/zlib
+	xmpp? (
+		>=app-crypt/qca-2.3.7:2[qt6]
+		>=kde-frameworks/kio-${KFMIN}:6
+		>=kde-frameworks/kwallet-${KFMIN}:6
+	)
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_JABBER_SUPPORT=$(usex xmpp)
+	)
+
+	ecm_src_configure
+}

diff --git a/kde-apps/ksirk/ksirk-9999.ebuild b/kde-apps/ksirk/ksirk-9999.ebuild
index a48425d7f8..1f700272f5 100644
--- a/kde-apps/ksirk/ksirk-9999.ebuild
+++ b/kde-apps/ksirk/ksirk-9999.ebuild
@@ -15,11 +15,11 @@ HOMEPAGE="https://apps.kde.org/ksirk/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
 KEYWORDS=""
-IUSE=""
+IUSE="xmpp"
 
 DEPEND="
-	>=app-crypt/qca-2.3.7:2[qt6]
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=kde-apps/libkdegames-${PVCUT}:6
 	>=kde-frameworks/kcompletion-${KFMIN}:6
@@ -27,13 +27,24 @@ DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
 	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/kwallet-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6]
 	sys-libs/zlib
+	xmpp? (
+		>=app-crypt/qca-2.3.7:2[qt6]
+		>=kde-frameworks/kio-${KFMIN}:6
+		>=kde-frameworks/kwallet-${KFMIN}:6
+	)
 "
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_JABBER_SUPPORT=$(usex xmpp)
+	)
+
+	ecm_src_configure
+}


             reply	other threads:[~2024-02-25 18:09 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-25 18:09 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-21 14:30 [gentoo-commits] proj/kde:master commit in: kde-apps/ksirk/ Sam James
2024-05-17 18:30 Andreas Sturmlechner
2024-05-17 18:30 Andreas Sturmlechner
2024-05-17 16:40 Andreas Sturmlechner
2022-10-11 15:18 Andreas Sturmlechner
2022-04-21 17:39 Andreas Sturmlechner
2021-02-15 14:39 Andreas Sturmlechner
2020-10-10 21:39 Andreas Sturmlechner
2018-02-22 13:17 Andreas Sturmlechner
2017-11-12 15:23 Andreas Sturmlechner
2017-08-17 15:27 Andreas Sturmlechner
2017-08-15 21:49 Andreas Sturmlechner
2016-04-06 19:24 Johannes Huber
2016-01-31 15:53 Michael Palimaka
2015-01-28 23:49 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=1708883926.a542aeb944cdb9fb4b9bab9bb19b44054cb09f64.sam@gentoo \
    --to=sam@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