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/libksane/
Date: Wed, 21 Aug 2024 21:47:30 +0000 (UTC)	[thread overview]
Message-ID: <1724273629.c3530dbf8c0e3824bdcc5ff73e74c7c36f518cfc.asturm@gentoo> (raw)

commit:     c3530dbf8c0e3824bdcc5ff73e74c7c36f518cfc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 16:34:56 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 20:53:49 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c3530dbf

kde-apps/libksane: RDEPEND on kde-apps/libksane-common

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/libksane/libksane-24.07.90.ebuild      | 12 +++++++++++-
 kde-apps/libksane/libksane-24.08.0.ebuild       | 12 +++++++++++-
 kde-apps/libksane/libksane-24.08.49.9999.ebuild | 12 +++++++++++-
 kde-apps/libksane/libksane-9999.ebuild          | 12 +++++++++++-
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/kde-apps/libksane/libksane-24.07.90.ebuild b/kde-apps/libksane/libksane-24.07.90.ebuild
index 9c362b9131..c2f9fa8a3e 100644
--- a/kde-apps/libksane/libksane-24.07.90.ebuild
+++ b/kde-apps/libksane/libksane-24.07.90.ebuild
@@ -24,9 +24,19 @@ DEPEND="
 	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	>=kde-apps/libksane-common-${PV}
 "
 
+# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/icons/hicolor/16x16/actions
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package kwallet KF6Wallet)

diff --git a/kde-apps/libksane/libksane-24.08.0.ebuild b/kde-apps/libksane/libksane-24.08.0.ebuild
index 9c362b9131..c2f9fa8a3e 100644
--- a/kde-apps/libksane/libksane-24.08.0.ebuild
+++ b/kde-apps/libksane/libksane-24.08.0.ebuild
@@ -24,9 +24,19 @@ DEPEND="
 	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	>=kde-apps/libksane-common-${PV}
 "
 
+# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/icons/hicolor/16x16/actions
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package kwallet KF6Wallet)

diff --git a/kde-apps/libksane/libksane-24.08.49.9999.ebuild b/kde-apps/libksane/libksane-24.08.49.9999.ebuild
index a99f7ae5d3..4d7a833da3 100644
--- a/kde-apps/libksane/libksane-24.08.49.9999.ebuild
+++ b/kde-apps/libksane/libksane-24.08.49.9999.ebuild
@@ -24,9 +24,19 @@ DEPEND="
 	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	>=kde-apps/libksane-common-${PV}
 "
 
+# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/icons/hicolor/16x16/actions
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package kwallet KF6Wallet)

diff --git a/kde-apps/libksane/libksane-9999.ebuild b/kde-apps/libksane/libksane-9999.ebuild
index a99f7ae5d3..4d7a833da3 100644
--- a/kde-apps/libksane/libksane-9999.ebuild
+++ b/kde-apps/libksane/libksane-9999.ebuild
@@ -24,9 +24,19 @@ DEPEND="
 	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	>=kde-apps/libksane-common-${PV}
 "
 
+# Shipped by kde-apps/libksane-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/icons/hicolor/16x16/actions
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package kwallet KF6Wallet)


             reply	other threads:[~2024-08-21 21:47 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-21 21:47 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-12 18:10 [gentoo-commits] proj/kde:master commit in: kde-apps/libksane/ Andreas Sturmlechner
2024-02-26 19:59 Andreas Sturmlechner
2024-01-07 13:26 Andreas Sturmlechner
2022-07-09 12:52 Andreas Sturmlechner
2017-12-09 14:36 Andreas Sturmlechner
2016-08-25 18:27 Michael Palimaka
2016-05-19 15:45 Johannes Huber
2016-04-29  7:18 Johannes Huber
2016-04-08 15:45 Michael Palimaka
2016-01-22 10:12 Michael Palimaka
2016-01-20 14:29 Michael Palimaka
2015-11-16 15:09 Michael Palimaka
2015-10-16 18:24 Michael Palimaka
2015-09-24 19:14 Michael Palimaka
2015-07-28 21:17 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=1724273629.c3530dbf8c0e3824bdcc5ff73e74c7c36f518cfc.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