commit: f4f65d265f8ca6793ad34786fa59f3c4cb05562e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 14:15:43 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 14:16:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4f65d26
kde-apps/calendarjanitor: Set ECM_HANDBOOK="false" and properly disable 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 <AT> gentoo.org>
.../calendarjanitor-24.07.90.ebuild | 10 +++--
.../calendarjanitor-24.08.49.9999.ebuild | 10 +++--
.../calendarjanitor/calendarjanitor-9999.ebuild | 10 +++--
.../calendarjanitor-24.05.2-loggingcategory.patch | 50 ++++++++++++++++++++++
4 files changed, 68 insertions(+), 12 deletions(-)
diff --git a/kde-apps/calendarjanitor/calendarjanitor-24.07.90.ebuild
b/kde-apps/calendarjanitor/calendarjanitor-24.07.90.ebuild
index 4964134aa2..661787d059 100644
--- 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
index a98932dbc4..07f32c2fce 100644
--- 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
index a98932dbc4..07f32c2fce 100644
--- 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
new file mode 100644
index 0000000000..e9796c3342
--- /dev/null
+++
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 <[email protected]>
+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 <[email protected]>
+---
+ 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
+
