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

commit:     9531c9df77745e630b93b29499d2bda8ac6a0458
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 21:40:25 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=9531c9df

kde-apps/konsolekalendar: RDEPEND on akonadi-calendar-tools-common

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

 ...r-24.07.90.ebuild => konsolekalendar-24.07.90-r1.ebuild} | 13 ++++++-------
 kde-apps/konsolekalendar/konsolekalendar-24.08.0.ebuild     | 13 ++++++-------
 .../konsolekalendar/konsolekalendar-24.08.49.9999.ebuild    | 13 ++++++-------
 kde-apps/konsolekalendar/konsolekalendar-9999.ebuild        | 13 ++++++-------
 4 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/kde-apps/konsolekalendar/konsolekalendar-24.07.90.ebuild b/kde-apps/konsolekalendar/konsolekalendar-24.07.90-r1.ebuild
similarity index 80%
rename from kde-apps/konsolekalendar/konsolekalendar-24.07.90.ebuild
rename to kde-apps/konsolekalendar/konsolekalendar-24.07.90-r1.ebuild
index cc8278da95..32e049d9d4 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-24.07.90.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-24.07.90-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 KDE_ORG_NAME="akonadi-calendar-tools"
 PVCUT=$(ver_cut 1-3)
 KFMIN=6.5.0
@@ -12,7 +12,7 @@ inherit ecm gear.kde.org
 DESCRIPTION="Command line interface to KDE calendars"
 HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS="~amd64 ~arm64"
 IUSE=""
@@ -26,13 +26,12 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-apps/akonadi-calendar-tools-common-${PV}
+"
 
 src_prepare() {
 	ecm_src_prepare
-
-	# delete colliding calendarjanitor translations
-	rm -f po/*/calendarjanitor.po || die
-
+	ecm_punt_po_install
 	cmake_comment_add_subdirectory calendarjanitor
 }

diff --git a/kde-apps/konsolekalendar/konsolekalendar-24.08.0.ebuild b/kde-apps/konsolekalendar/konsolekalendar-24.08.0.ebuild
index cc8278da95..32e049d9d4 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-24.08.0.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-24.08.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 KDE_ORG_NAME="akonadi-calendar-tools"
 PVCUT=$(ver_cut 1-3)
 KFMIN=6.5.0
@@ -12,7 +12,7 @@ inherit ecm gear.kde.org
 DESCRIPTION="Command line interface to KDE calendars"
 HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS="~amd64 ~arm64"
 IUSE=""
@@ -26,13 +26,12 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-apps/akonadi-calendar-tools-common-${PV}
+"
 
 src_prepare() {
 	ecm_src_prepare
-
-	# delete colliding calendarjanitor translations
-	rm -f po/*/calendarjanitor.po || die
-
+	ecm_punt_po_install
 	cmake_comment_add_subdirectory calendarjanitor
 }

diff --git a/kde-apps/konsolekalendar/konsolekalendar-24.08.49.9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-24.08.49.9999.ebuild
index 55fe94f21e..dd16b0ce1e 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-24.08.49.9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-24.08.49.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 KDE_ORG_NAME="akonadi-calendar-tools"
 PVCUT=$(ver_cut 1-3)
 KFMIN=6.5.0
@@ -12,7 +12,7 @@ inherit ecm gear.kde.org
 DESCRIPTION="Command line interface to KDE calendars"
 HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS=""
 IUSE=""
@@ -26,13 +26,12 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-apps/akonadi-calendar-tools-common-${PV}
+"
 
 src_prepare() {
 	ecm_src_prepare
-
-	# delete colliding calendarjanitor translations
-	rm -f po/*/calendarjanitor.po || die
-
+	ecm_punt_po_install
 	cmake_comment_add_subdirectory calendarjanitor
 }

diff --git a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
index 55fe94f21e..dd16b0ce1e 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 KDE_ORG_NAME="akonadi-calendar-tools"
 PVCUT=$(ver_cut 1-3)
 KFMIN=6.5.0
@@ -12,7 +12,7 @@ inherit ecm gear.kde.org
 DESCRIPTION="Command line interface to KDE calendars"
 HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS=""
 IUSE=""
@@ -26,13 +26,12 @@ DEPEND="
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=kde-apps/akonadi-calendar-tools-common-${PV}
+"
 
 src_prepare() {
 	ecm_src_prepare
-
-	# delete colliding calendarjanitor translations
-	rm -f po/*/calendarjanitor.po || die
-
+	ecm_punt_po_install
 	cmake_comment_add_subdirectory calendarjanitor
 }


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

Thread overview: 13+ 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 14:23 [gentoo-commits] proj/kde:master commit in: kde-apps/konsolekalendar/ Andreas Sturmlechner
2023-08-06 20:39 Andreas Sturmlechner
2022-10-16 11:42 Andreas Sturmlechner
2021-12-09 11:28 Andreas Sturmlechner
2018-12-12 15:46 Andreas Sturmlechner
2017-04-25 20:58 Andreas Sturmlechner
2017-04-08  8:31 Andreas Sturmlechner
2016-08-31 14:33 Michael Palimaka
2016-05-26 15:08 Michael Palimaka
2016-05-11  9:51 Michael Palimaka
2016-04-24 17:52 Michael Palimaka
2016-04-04 22:51 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.9531c9df77745e630b93b29499d2bda8ac6a0458.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