gentoo auto-resync : 08:02:2025 - 00:11:30HEADmaster

3 files changed, 42 insertions, 8 deletions

diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 60892d201627..bcac633a1078 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,6 +1,7 @@
 AUX kbibtex-0.10.0-cxx17.patch 242 BLAKE2B 0b59543f0bd104d4ce7ede07af846d0377e18eee3d9a7c84812fe1cd5411fd3d99de4a37268acfb05732c961f3f8ab840061add2240317a09a3ba800f5fa77b8 SHA512 579acb65da7bfb0f66188b17e719554a20180790da589c361b618f8b717dfa19c99357352a89dbe21f5e770ef233b57cb612b1eaef771e001d9f61e2442e5473
+AUX kbibtex-0.10.50_pre20250205-cmake.patch 770 BLAKE2B e8fbb89789626bc168fa2dff2173724524ee25bcd4ed38683f64a0487868295b6fcf38f1849a7feec113daf1c0ab70d5786c1cb3f4363fedd76a9a853242a107 SHA512 2e1e2c237b13f77906eb1e82510931c4be0f59bd2ea5a6d5d3722b62fd51aabb754cc47d7c0d9dc098942bf27eaf3fb3d5521cf3daad245983a54f39d4e5e7fe
 DIST kbibtex-0.10.0.tar.xz 3885328 BLAKE2B c417cc3628739e1f3ed3231e9ba5387834a65b4ef78517273b53876ecc89e72194cdbbe14a5a479c5948beb5219d0345b1c22daa6f394b6ad7d664e260c8124d SHA512 37f4e9eb0bd7be8a64bae4076be20a6e59b33f17d59de35dec8833bce027172388aa3a49a8cbdac84c56686ad287a39e0c6f13665ed9e9b696c9ce3a6ec7de1d
-DIST kbibtex-0.10.50_pre20250113-3b5dcb59.tar.gz 5612866 BLAKE2B 1e338432fdc0ee9119127bd73df14e45d77a07d259c81802d614e8e42785fa4dd91676708bd8178f9833cf848149acf07d2997485afb71821b9966e98f663f30 SHA512 9981cd4af9a89c5b500bf30b30f0d54e18fbe2822cd90aee4191872874370b1d0823d8753419b89b3287923f449d942ed21e2a60f8d8bf0fdd97fa25e8840e08
+DIST kbibtex-0.10.50_pre20250205-b76e7904.tar.gz 5618097 BLAKE2B 1bb8623c725471e298ce070d3a9cc19bd7ff31b2d5a1b9c8508ef4edd668b9763645fb7a6993d8217a020af51fe1673fbbd38dd2c2f7d1ba16d86a96951f7441 SHA512 44c15c7b9cc18b8b43557b89c194d431128af5dcbe98bc511fb41534b17d578bfe20caf3bc8050bd14b8b3298ba903b4dbeec8396d0de2cf40750096736c2195
 EBUILD kbibtex-0.10.0.ebuild 2060 BLAKE2B 50de1c14dfbea938806133731a05471c3663effbf12b670203ec4aa53cd44fa50319e19f075fbf8cb53ba1893a2e5b2cc171e4d1c3026a188a22049f258064be SHA512 e5bb71bc975e339c21d2fa2dacd99720cb5176058b6365fc0feb7aa999a0bf8fcf4368dd98d2b991cef1239573fa8cf43ae1f945a010a5b191eee9fe929b41a2
-EBUILD kbibtex-0.10.50_pre20250113.ebuild 1914 BLAKE2B ca47a0bdf36e722578ab696f549207a5a5306db72df28e1dca6c922d7311cfee1599702522aadb07a060188785a3bada8303bac7af162d0f6953a08ea41fc280 SHA512 55c9f266999fde63127907ed8ca074127d450c1b2e7e9e3adc65c05c71ff3c3b68801559844be5f8133aecad4e70fd707abb0eb7f6290acb6bbff371b9f40540
+EBUILD kbibtex-0.10.50_pre20250205.ebuild 1994 BLAKE2B 0c86fe4b8447d1b901429320d31d430177fdd558205ba712d99e458ebaf4637a792cd491e028e40b04d9adc962ff00e15ee4e66333fc2942f976c8113ebdb192 SHA512 a6bdb198d8221aff0651d8aa6d9152464b6002c571f470c122404bd2520b00eb1924e23d87b68739eb317f42ebabf36a0086dc6da600a8ccbad26fd70118396c
 MISC metadata.xml 475 BLAKE2B 6c3a5245ac69ad2d11b237110b8cde75095e81e3cb0c634e71d83dec5a19c9edd8f6af4875e58dd10ef4dc7916885594b9ad1d1b5408c1665671ce9461558dc3 SHA512 ef88f2dd9bafb66f8091e29b9a7be844a17791a6dde81e4ed565abfebc59224d84f19aa91e4016341e31b6fcdb591d04707fe5f3092f8f777e796387f781e973
diff --git a/app-text/kbibtex/files/kbibtex-0.10.50_pre20250205-cmake.patch b/app-text/kbibtex/files/kbibtex-0.10.50_pre20250205-cmake.patch
new file mode 100644
index 000000000000..7b96a9a07caf
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.10.50_pre20250205-cmake.patch
@@ -0,0 +1,29 @@
+From fa79e2682a51ec1920ea80af5dcc4fd9f9af320a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 6 Feb 2025 22:46:40 +0100
+Subject: CMake: Re-add lookup of KDocTools
+
+Commented out in commit 11f6daece7d1d3d9c84db5b8aea25017aaba1c9d and
+further cleaned up in commit c0988c00d04012c2767f59149dd954b34599742e
+without comment.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 47df2bae..a160ebfe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -180,6 +180,8 @@ find_package(
+     MODULE
+     REQUIRED
+     Config
++    OPTIONAL_COMPONENTS
++    DocTools
+ )
+ if(BUILD_KPART OR BUILD_TESTING)
+     find_package(
+-- 
+2.48.1
diff --git a/app-text/kbibtex/kbibtex-0.10.50_pre20250113.ebuild b/app-text/kbibtex/kbibtex-0.10.50_pre20250205.ebuild
index 96dabb1e1157..9eb0b4ff1951 100644
--- a/app-text/kbibtex/kbibtex-0.10.50_pre20250113.ebuild
+++ b/app-text/kbibtex/kbibtex-0.10.50_pre20250205.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=3b5dcb59ca4b7a27b4549e37f951e8a358f8d89f
+KDE_ORG_COMMIT=b76e7904b8288f001beb4fc0a60a5c66448de85d
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm kde.org optfeature
+PYTHON_COMPAT=( python3_{10..13} )
+KFMIN=6.9.0
+QTMIN=6.7.2
+inherit ecm kde.org optfeature python-any-r1 xdg
 
 DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
 HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
@@ -51,12 +52,15 @@ RDEPEND="${COMMON_DEPEND}
 	dev-tex/bibtex2html
 "
 DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
 	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
 "
 
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) # bug 949362, pending upstream
+
 src_configure() {
 	local mycmakeargs=(
-		-DQT_MAJOR_VERSION=6 # TODO: re-add KDocTools search to this awful piece of cmake...
+		-DQT_MAJOR_VERSION=6
 		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
 	)
 
@@ -67,5 +71,5 @@ pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "PDF or PostScript document previews" "kde-apps/okular:6"
 	fi
-	ecm_pkg_postinst
+	xdg_pkg_postinst
 }