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

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

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
index cc8278da95e..32e049d9d4c 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 cc8278da95e..32e049d9d4c 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 55fe94f21ee..dd16b0ce1e3 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 55fe94f21ee..dd16b0ce1e3 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
 }