kde-apps/calendarjanitor: Set ECM_HANDBOOK="false" and properly disab…

…le it There is no handbook for this package, so there should be no IUSE. Also, do not install an empty logging categories file. Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
a17r · Aug 12, 2024 · f4f65d2 · f4f65d2
1 parent 6028291
commit f4f65d2
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 12 deletions.
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.07.90.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.07.90.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_HANDBOOK="false"
 ECM_TEST="false"
 KDE_ORG_NAME="akonadi-calendar-tools"
 PVCUT=$(ver_cut 1-3)
@@ -13,7 +13,7 @@ inherit ecm gear.kde.org
 
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS="~amd64 ~arm64"
 IUSE=""
@@ -29,11 +29,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-24.05.2-loggingcategory.patch" )
+
 src_prepare() {
 	ecm_src_prepare
-
+	ecm_punt_kf_module DocTools
+	sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die
 	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
 
 	# delete colliding konsolekalendar translations
 	rm -f po/*/konsolekalendar.po || die

diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.08.49.9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-24.08.49.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_HANDBOOK="false"
 ECM_TEST="false"
 KDE_ORG_NAME="akonadi-calendar-tools"
 PVCUT=$(ver_cut 1-3)
@@ -13,7 +13,7 @@ inherit ecm gear.kde.org
 
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS=""
 IUSE=""
@@ -29,11 +29,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-24.05.2-loggingcategory.patch" )
+
 src_prepare() {
 	ecm_src_prepare
-
+	ecm_punt_kf_module DocTools
+	sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die
 	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
 
 	# delete colliding konsolekalendar translations
 	rm -f po/*/konsolekalendar.po || die

diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_HANDBOOK="false"
 ECM_TEST="false"
 KDE_ORG_NAME="akonadi-calendar-tools"
 PVCUT=$(ver_cut 1-3)
@@ -13,7 +13,7 @@ inherit ecm gear.kde.org
 
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS=""
 IUSE=""
@@ -29,11 +29,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-24.05.2-loggingcategory.patch" )
+
 src_prepare() {
 	ecm_src_prepare
-
+	ecm_punt_kf_module DocTools
+	sed -i -e "/kdoctools_install/I s/^/#DONT/" CMakeLists.txt || die
 	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
 
 	# delete colliding konsolekalendar translations
 	rm -f po/*/konsolekalendar.po || die

diff --git a/kde-apps/calendarjanitor/files/calendarjanitor-24.05.2-loggingcategory.patch b/kde-apps/calendarjanitor/files/calendarjanitor-24.05.2-loggingcategory.patch
@@ -0,0 +1,50 @@
+From 1c10a1418a063d625dce2fc1a5714b82f9cee728 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 12 Aug 2024 16:02:27 +0200
+Subject: [PATCH] Move ecm_qt_install_logging_categories to konsolekalendar
+ subdir
+
+None is declared in calendarjanitor.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                 | 6 ------
+ konsolekalendar/CMakeLists.txt | 5 +++++
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d887d81..f79b923 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,12 +79,6 @@ endif()
+ add_subdirectory(calendarjanitor)
+ add_subdirectory(konsolekalendar)
+
+-ecm_qt_install_logging_categories(
+-        EXPORT AKONADICALENDARTOOLS
+-        FILE console.categories
+-        DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+-        )
+-
+ add_subdirectory(doc)
+ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+ ki18n_install(po)
+diff --git a/konsolekalendar/CMakeLists.txt b/konsolekalendar/CMakeLists.txt
+index c0b0eab..7e90f6c 100644
+--- a/konsolekalendar/CMakeLists.txt
++++ b/konsolekalendar/CMakeLists.txt
+@@ -44,6 +44,11 @@ target_link_libraries(konsolekalendar
+
+ install(TARGETS konsolekalendar  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+
++ecm_qt_install_logging_categories(
++        EXPORT AKONADICALENDARTOOLS
++        FILE console.categories
++        DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
++        )
+
+ ########### install files ###############
+
+-- 
+2.45.2
+