[gentoo-commits] repo/gentoo:master commit in: profiles/arch/x86/, app-office/kraft/, profiles/arch/amd64/x32/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/x86/, app-office/kraft/, profiles/arch/amd64/x32/, ...

[Andreas Sturmlechner]

commit:     3e3841532c2f45fda9b4994be438d101d006740f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 19 20:48:46 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 19 21:04:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e384153

app-office/kraft: add 2.0_pre20250419

Upstream:
"Yes, indeed the Qt6 port is more or less finished in the branch.
I am about to merge it once the AppImage build succeeds and the
AppImage works."

Closes: https://bugs.gentoo.org/954090
Closes: https://bugs.gentoo.org/953987
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/kraft/Manifest                          |  1 +
 ...-2.0_pre20250419-no-git-or-buildhost-info.patch | 38 ++++++++++++++++
 app-office/kraft/kraft-2.0_pre20250419.ebuild      | 53 ++++++++++++++++++++++
 profiles/arch/amd64/x32/package.use.mask           |  1 +
 profiles/arch/x86/package.use.mask                 |  1 +
 5 files changed, 94 insertions(+)

diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index 292e3e07f1da..eb48c3e550f7 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1 +1,2 @@
 DIST kraft-1.0.tar.gz 3629908 BLAKE2B b40dc2d647e2985b01d9ee241fbd8cf1eb551621c4635a79c248d69538d2ac034889828461f11e6eefc5258bafe160f421c2960ad80de2a264a8978a4687ad56 SHA512 c45b41ed6eb3eae1f29d158506ea59d55a636974bfb655b307e3045edefcbee84fd833e16cf06b7317e8f634e1efef83841a7361af86007973ab2ef234c32585
+DIST kraft-2.0_pre20250419.tar.gz 5978799 BLAKE2B f9442733fa139cc9a58dd5a174607bc38ecabb781ffba2de043d5beb7068b7d2979173afde2c4736d83a42451eaaca31de71c708f7f5f47a7d8e5f0fcafc6b38 SHA512 5f7d40aa67d541253cc0cd5a7ba456319a279f53c82f30c52172473a8f3b1aa7856c2691ee91ba9d81e82e18541dd513906f119f516c8d1146296353759bb555

diff --git a/app-office/kraft/files/kraft-2.0_pre20250419-no-git-or-buildhost-info.patch b/app-office/kraft/files/kraft-2.0_pre20250419-no-git-or-buildhost-info.patch
new file mode 100644
index 000000000000..2d53ff799d72
--- /dev/null
+++ b/app-office/kraft/files/kraft-2.0_pre20250419-no-git-or-buildhost-info.patch
@@ -0,0 +1,38 @@
+From 587ef0f18b5b76cd38e92b6ae4ad9f9f320dc4e7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 19 Apr 2025 22:19:39 +0200
+Subject: [PATCH] Disable git usage, disable build host info
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 47b2fea..d905ecd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,6 +21,7 @@ set(AKO_PREFIX "KPim6")
+ 
+ message("Akonadi Prefix is ${AKO_PREFIX}")
+ 
++if(0)
+ include(GetGitRevisionDescription)
+ 
+ # set git revision info
+@@ -62,6 +63,12 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.22.0")
+ else ()
+     set(BUILD_HOST_DISTRI "unknown distribution")
+ endif()
++else()
++    message("GIT_SHA1: ${GIT_SHA1}")
++    message("GIT_BRANCH: ${GIT_BRANCH}")
++    set(BUILD_HOST_NAME "denied")
++    set(BUILD_HOST_DISTRI "Gentoo Linux")
++endif()
+ message("Build host name: ${BUILD_HOST_NAME}")
+ message("Build host distribution: ${BUILD_HOST_DISTRI}")
+ 
+-- 
+2.49.0
+

diff --git a/app-office/kraft/kraft-2.0_pre20250419.ebuild b/app-office/kraft/kraft-2.0_pre20250419.ebuild
new file mode 100644
index 000000000000..5b65df8968bd
--- /dev/null
+++ b/app-office/kraft/kraft-2.0_pre20250419.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=37e3a51e11fb630ec3fc910a6d15457d8f3de55e
+KFMIN=6.9.0
+inherit ecm
+
+DESCRIPTION="Quotes and invoices manager for small enterprises"
+HOMEPAGE="https://www.volle-kraft-voraus.de/"
+SRC_URI="https://github.com/dragotin/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pim"
+
+RESTRICT="test" # requires package installed, bug 745408
+
+DEPEND="
+	dev-qt/qtbase:6[concurrent,gui,network,sql,widgets,xml]
+	dev-qt/qtsvg:6
+	kde-frameworks/kconfig:6
+	kde-frameworks/kcontacts:6
+	kde-frameworks/ki18n:6
+	kde-frameworks/ktexttemplate:6
+	pim? (
+		kde-apps/akonadi:6
+		kde-apps/akonadi-contacts:6
+		kde-frameworks/kcoreaddons:6
+	)
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+
+DOCS=( AUTHORS Changes.txt README.md Releasenotes.txt TODO )
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-git-or-buildhost-info.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=ON
+		-DGIT_SHA1=${COMMIT}
+		-DGIT_BRANCH=portqt6_1
+		-DBUILD_WITH_AKONADI=$(usex pim)
+	)
+	ecm_src_configure
+}

diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 831c341d5bfa..21661ad5080c 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -53,6 +53,7 @@ media-libs/libva-intel-driver hybrid
 # reverse-dependencies.
 app-i18n/fcitx-libpinyin dictionary-manager
 app-misc/anki gui
+app-office/kraft pim
 dev-lang/idris2 test-full
 dev-python/cloudscraper test
 games-util/lgogdownloader gui

diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 5de2ab42c9a7..59615f7b9903 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -147,6 +147,7 @@ media-tv/mythtv nvdec
 # Bug #893234
 app-i18n/fcitx-libpinyin dictionary-manager
 app-misc/anki gui
+app-office/kraft pim
 dev-lang/idris2 test-full
 dev-python/cloudscraper test
 dev-python/qtpy test