gentoo auto-resync : 14:02:2024 - 23:36:42

5 files changed, 122 insertions, 80 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3499004431d3..bc990cfdbe20 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,4 +1,5 @@
 AUX libreoffice-24.2-kf6-buildfix.patch 1432 BLAKE2B c17f4e30d4e789699edba2b906a45664236323f0fd330bfaa241e43ff7511a77ff06aa6df9780285047ae382e9424894cdfa104ac188e119a1ceba1ee4fc15c0 SHA512 c3108ca0fdddc167f7b16bf4905253755e489d366aa6457edb1f092c64aef9cccde43c37f1cfd9b8500c9e215755044e33921773f54a86b9f7be8f65c9d9163a
+AUX libreoffice-24.2-kf6-configure.patch 2246 BLAKE2B 71c085ea4743ce065665d31af67b82ce4b1e27f083de697a3845a01a6595c4df463c7f242eb63950a180a4d396c83e602e5bc36b1b29188271f102a7f6b1afb0 SHA512 4c0956e701f60ba2f6c26cfaadb1816012f19ffc7688d89bac00492cc80b8967f1cd98a483083dc119b7b7c8ea152aa3763b260a49ec884ec7a40e5957e641c6
 AUX libreoffice-24.2-qtdetect.patch 989 BLAKE2B 01e1c1493293363206cd43ded09b69becd02b0b93c2fcb5fd4387a54424b9fa552ebfa128290a1b0551e6b6fe5de8f57025a2ebf5c75da2ea01bd66f5910f9d6 SHA512 dc00b2afe98f7bf30637c4102e336d6781f76cd7eb6c339c0b369ec2aa50544bc266fd42540fea037c1fcd07ae7e6d1b6503be620db9127084ffe6528f8db4b1
 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
@@ -29,22 +30,22 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
 DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
-DIST libreoffice-24.2.0.3.tar.xz 280356652 BLAKE2B 01e9a9d7ce47870538676dd6f2fd68823309477fda72090c4a23a0d6dc181efaa751c98612a63d13833821edd574d802a06b41457f74571b63331510ed9bac9b SHA512 a89617761051d30829cedaaf865974979b1a444f72a208fdeafdd5806741abccc7d239c291f71fdaf46a039ed3060b51592cffb9db6fbc6a795e8eaaa3d2e61e
+DIST libreoffice-24.2.1.1.tar.xz 280318924 BLAKE2B 62530c44ede834699054d07e9694264b7c2c74309e6aa4bd3b6e1c7b9d6ce8ecbd74c55e2748eaf38fe43740f4d3bcbfbbf0507752ce0c3b1269275f20eeb6a1 SHA512 33ff4852274bf6f6c37a2bfdddc925afdaf893352b830154e679b7ed919f697713a0beaf45315c61084b0f2b5c8e16635f9065de610d425581f640425de3fe67
 DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
 DIST libreoffice-7.5.9.2.tar.xz 270609308 BLAKE2B 8fbbe665b31aa6b85d17fa279da44da87817b8521abf40d80a40383b726e6cfb4026f9db50ac0a9bea92e88dc8be96a922a6937992d35b3766fda54f9fa7377a SHA512 36a012c044d755b2a9c1b0cea42290239647bdf81af198245075d89e19fb25b0e404a71db6beff743f738f059a85818bc89adb051c24b09234a763f42008b6e1
 DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-24.2.0.3.tar.xz 167071080 BLAKE2B 67b20caf722c66cd60ba63ca662d6049152ecccb7684e260d42edb7a0dc68e61771d857f6c0199257aa48b863e019849195203d18d04ef1637fbab899dca45e8 SHA512 33d71e8434426bc007fc5ca866465e9e452cdb369d42dd3442dc66b42228e98c47449056caa7bbc4857ed70d00dd237e507b51f24861c9587e320a8c958c1f1b
+DIST libreoffice-help-24.2.1.1.tar.xz 167069068 BLAKE2B de7795c3e57da85a4329562cdeed1017e34ef2743b2441392183a54557b40ba7f36b87ad534a61610e9bf37671f56e4d9fdffda794f0a61163bee3206f1515ea SHA512 e9f09a2d6adbdd01bae9bf05d9a0f573878cf37e10468eaf0c1cbcd05e109d6bec3c496bdcb58030bd5f8d1472342334f983c63ecc3756ff2c9a0e231b86fdb9
 DIST libreoffice-help-7.5.9.2.tar.xz 166236976 BLAKE2B c4c6c1e0ace4ebf43f1110edc21d9debb42b3a3756320ebec7d6e9f42b258c6d959a45778a4fc60aba85b4e7e852dbd9089a5694e32d37f5aa39f84ce826a18f SHA512 a3ad0005d0b09f0cc221a92f822c666a2d954cbf74d5f7c16e083cfaa4cfbc7a442d12dbcb51a3eaf3a7b3bd774f17614d79b6ec7553cec46edcb341c97ecf5b
 DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
 DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
 DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8
-EBUILD libreoffice-24.2.0.3.ebuild 20424 BLAKE2B 97cd2f0e05bb705dda5ab6898b6a95068e9af3a4117ada634f1559902f24dd4b7f5dce29274ad496249bb50b7a9a264b9563002cd6b12ef27dd33b63c3f72e2c SHA512 8efd089101b9beed700db42758615c520642aa5aa387d6f59c698fdd9c8264507e3e2c891afaf470e152486aaedc8ef079966e0047c13617867dcd579fe857f3
-EBUILD libreoffice-24.2.9999.ebuild 20253 BLAKE2B b830c1e52d38402ed2b3cbf883b6e15f173f0056c162c5be10387d2614629c6e9b878dc3899cceccaa8dc8fa11c72742cda9ebf200293763ca48a6e037fd3c14 SHA512 8c10b71ef1c9370fdfa58330ffc8914731810990944ddc5fac2019286f7b67e99fe6e94ceb4d5b0cea7de792541ed2cec9192ca457e5ab9bb5cf91d680a10714
+EBUILD libreoffice-24.2.1.1.ebuild 20424 BLAKE2B 6a8c80b10a0a5ffe466f7f4f9cf96f5a1812960f684ec0fa27b4c6100b54662a08dd99f75a4ee0c7f26fa216ceacf29d9e561d1ee80b818fba905c396b4d6cc4 SHA512 0009c741c8af2691e3648cfa75a067caaf8f27b915039b5c80f501aa19bd3190f0d85f2a0235ff9108c7716afe5a903d92923a5760787e617261a9079bb856b5
+EBUILD libreoffice-24.2.9999.ebuild 20222 BLAKE2B fee79a008428c0c47cfbd9f7d331b516250d376793e8cef6e03aa5ac0e6bcee23f912a22d22f6a56ca7aa89a2f1b06fa174644a63ed87fea31053f07cbcfe1ad SHA512 456ab217c5745ee35191e7314d4f231bbef1e456596b0834b10307afa98ba4bac132c85a491a555695aeefe433c406435dd238039e140ae9a082c789184dd713
 EBUILD libreoffice-7.5.9.2.ebuild 19762 BLAKE2B 6f294984c1e56fd662d87308a3a81d47c951be4fba2317d7a8b54e5974c8e241c117bcfa5c7fc31d5201d77cd3934321ec508142db38a78528ae39d64bb4b3ba SHA512 a2ade7c49579b198e913b480cebba8f4ab53b61cb556abc180e9851036cf827fffeb2b6dc59ba7f3d96df70cc6b6b63d51abc787bf30455fa2016eefa466ce10
 EBUILD libreoffice-7.6.4.1.ebuild 19681 BLAKE2B af8b3b6969804b5c01bc37307da92136add49bd4ca31e182aa669589bd880309de2b771557ee114737db8904d11295a3c7ee1bd5e25bdcfdb78a909bb242497d SHA512 ed0d6bfa3930ec1a9284e102c7ddb0848aebb1126e35f34936fcca66c540938afa28af40be68c348085ab73f637005dc3e28917b519e4c96f0d602450c7785f0
 EBUILD libreoffice-7.6.9999.ebuild 19682 BLAKE2B abbe11295e39dd138ae734ccb2beb7fbf7b430a724812ff34de73ddf3d081cb19fbe5d7330e31ba777f69a5158fa3bebcbf266b1c5a154197fb3015f53da08ce SHA512 5300f03d4b85034ab982fcffdc9e45e2f5d8241dbfe50c9b9dc689eee32fcef14293bbf086f7d689536d3d3c75d5fcdb0699950d64a4763d9413b0d2e2a61e7e
-EBUILD libreoffice-9999.ebuild 20253 BLAKE2B b830c1e52d38402ed2b3cbf883b6e15f173f0056c162c5be10387d2614629c6e9b878dc3899cceccaa8dc8fa11c72742cda9ebf200293763ca48a6e037fd3c14 SHA512 8c10b71ef1c9370fdfa58330ffc8914731810990944ddc5fac2019286f7b67e99fe6e94ceb4d5b0cea7de792541ed2cec9192ca457e5ab9bb5cf91d680a10714
+EBUILD libreoffice-9999.ebuild 20222 BLAKE2B fee79a008428c0c47cfbd9f7d331b516250d376793e8cef6e03aa5ac0e6bcee23f912a22d22f6a56ca7aa89a2f1b06fa174644a63ed87fea31053f07cbcfe1ad SHA512 456ab217c5745ee35191e7314d4f231bbef1e456596b0834b10307afa98ba4bac132c85a491a555695aeefe433c406435dd238039e140ae9a082c789184dd713
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
diff --git a/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch b/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch
new file mode 100644
index 000000000000..2a4952d7e7cc
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch
@@ -0,0 +1,61 @@
+From ec69b448f4b6296edb6b28ced5ecb710be82438b Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn@posteo.de>
+Date: Tue, 13 Feb 2024 16:25:35 +0100
+Subject: [PATCH] scp2: Take ENABLE_{KF,QT}6 into account
+
+The qt6 and kf6 VCL plugins are also part
+of the kde install set, so take
+`ENABLE_QT6` and `ENABLE_KF6` into
+account when deciding whether to install
+it.
+
+This makes packaging these VCL plugins work
+when building with `--enable-qt6` and/or
+`--enable-kf6`, but without `--enable-qt5`
+and `--enable-kf5`.
+
+Command that can be used for testing:
+
+    make DESTDIR=/tmp/dummy distro-pack-install -o build -o check
+
+(Then, check whether the "installation" in /tmp/dummy
+contains the VCL plugins as expected.)
+
+Thanks to Andreas Sturmlechner for reporting
+the issue on IRC #libreoffice-dev on 2024-02-12.
+
+Change-Id: Ieea67468e3388f8b7b66f53221574c6225516b44
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163313
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
+---
+ scp2/InstallScript_setup_osl.mk | 2 +-
+ scp2/Module_scp2.mk             | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
+index 6f7b58204225e..cf69165c1b60f 100644
+--- a/scp2/InstallScript_setup_osl.mk
++++ b/scp2/InstallScript_setup_osl.mk
+@@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
+ 	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\
+ 		scp2/gnome \
+ 	) \
+-	$(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\
++	$(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_QT6) $(ENABLE_KF5) $(ENABLE_KF6) $(ENABLE_GTK3_KDE5)),\
+ 		scp2/kde \
+ 	) \
+ 	$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
+index 25ae8167df561..651413fa2c17e 100644
+--- a/scp2/Module_scp2.mk
++++ b/scp2/Module_scp2.mk
+@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
+ 	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\
+ 		InstallModule_gnome \
+ 	) \
+-	$(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\
++	$(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_QT6) $(ENABLE_KF5) $(ENABLE_KF6) $(ENABLE_GTK3_KDE5)),\
+ 		InstallModule_kde \
+ 	) \
+ ))
diff --git a/app-office/libreoffice/libreoffice-24.2.0.3.ebuild b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
index 4c68aafe99c5..a01d614a45dd 100644
--- a/app-office/libreoffice/libreoffice-24.2.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
@@ -91,12 +91,13 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	base? ( java )
 	bluetooth? ( dbus )
+	kde? ( || ( qt5 qt6 ) )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
@@ -208,11 +209,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		x11-libs/pango
 	)
 	kde? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
+		qt5? (
 			kde-frameworks/kconfig:5
 			kde-frameworks/kcoreaddons:5
 			kde-frameworks/ki18n:5
@@ -234,6 +231,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	!mariadb? ( dev-db/mysql-connector-c:= )
 	pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
 	qt6? ( dev-qt/qtbase:6[gui,widgets] )
 "
 # FIXME: cppunit should be moved to test conditional
@@ -313,12 +316,13 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-24.2-qtdetect.patch"
 
-	# not yet upstream, sourced from Mandriva
-	"${FILESDIR}/${PN}-24.2-kf6-buildfix.patch"
-
 	# maybe upstreamable
 	"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
 
+	# git master, pending 24.2
+	"${FILESDIR}/${PN}-24.2-kf6-configure.patch"
+	"${FILESDIR}/${PN}-24.2-kf6-buildfix.patch"
+
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -474,12 +478,11 @@ src_configure() {
 	export PYTHON_CFLAGS=$(python_get_CFLAGS)
 	export PYTHON_LIBS=$(python_get_LIBS)
 
+	if use qt5; then
+		export QT5DIR="$(qt5_get_bindir)/.."
+	fi
 	if use qt6; then
 		export QT6DIR="$(qt6_get_bindir)/.."
-	else
-		if use kde; then
-			export QT5DIR="$(qt5_get_bindir)/.."
-		fi
 	fi
 
 	local gentoo_buildid="Gentoo official package"
@@ -508,7 +511,7 @@ src_configure() {
 		--enable-build-opensymbol
 		--enable-cairo-canvas
 		--enable-largefile
-		--enable-mergelibs
+		--enable-mergelibs=more
 		--enable-python=system
 		--enable-randr
 		--enable-release-build
@@ -559,6 +562,8 @@ src_configure() {
 		$(use_enable odk)
 		$(use_enable pdfimport)
 		$(use_enable postgres postgresql-sdbc)
+		$(use_enable qt5)
+		$(use_enable qt6)
 		$(use_enable vulkan skia)
 		$(use_with accessibility lxml)
 		$(use_with coinmp system-coinmp)
@@ -569,19 +574,8 @@ src_configure() {
 		$(use_with valgrind)
 	)
 
-	if use qt6; then
-		myeconfargs+=(
-			--disable-qt5
-			$(use_enable qt6 qt6)
-			$(use_enable kde kf6)
-		)
-	else
-		myeconfargs+=(
-			--disable-qt6
-			$(use_enable kde kf5)
-			$(use_enable kde qt5)
-		)
-	fi
+	use qt5 && myeconfargs+=( $(use_enable kde kf5) )
+	use qt6 && myeconfargs+=( $(use_enable kde kf6) )
 
 	if use eds || use gtk; then
 		myeconfargs+=( --enable-dconf --enable-gio )
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
index 6e84f6de9008..dd6d14b2c12d 100644
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -91,12 +91,13 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	base? ( java )
 	bluetooth? ( dbus )
+	kde? ( || ( qt5 qt6 ) )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
@@ -208,11 +209,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		x11-libs/pango
 	)
 	kde? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
+		qt5? (
 			kde-frameworks/kconfig:5
 			kde-frameworks/kcoreaddons:5
 			kde-frameworks/ki18n:5
@@ -234,6 +231,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	!mariadb? ( dev-db/mysql-connector-c:= )
 	pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
 	qt6? ( dev-qt/qtbase:6[gui,widgets] )
 "
 # FIXME: cppunit should be moved to test conditional
@@ -467,12 +470,11 @@ src_configure() {
 	export PYTHON_CFLAGS=$(python_get_CFLAGS)
 	export PYTHON_LIBS=$(python_get_LIBS)
 
+	if use qt5; then
+		export QT5DIR="$(qt5_get_bindir)/.."
+	fi
 	if use qt6; then
 		export QT6DIR="$(qt6_get_bindir)/.."
-	else
-		if use kde; then
-			export QT5DIR="$(qt5_get_bindir)/.."
-		fi
 	fi
 
 	local gentoo_buildid="Gentoo official package"
@@ -501,7 +503,7 @@ src_configure() {
 		--enable-build-opensymbol
 		--enable-cairo-canvas
 		--enable-largefile
-		--enable-mergelibs
+		--enable-mergelibs=more
 		--enable-python=system
 		--enable-randr
 		--enable-release-build
@@ -552,6 +554,8 @@ src_configure() {
 		$(use_enable odk)
 		$(use_enable pdfimport)
 		$(use_enable postgres postgresql-sdbc)
+		$(use_enable qt5)
+		$(use_enable qt6)
 		$(use_enable vulkan skia)
 		$(use_with accessibility lxml)
 		$(use_with coinmp system-coinmp)
@@ -562,19 +566,8 @@ src_configure() {
 		$(use_with valgrind)
 	)
 
-	if use qt6; then
-		myeconfargs+=(
-			--disable-qt5
-			$(use_enable qt6 qt6)
-			$(use_enable kde kf6)
-		)
-	else
-		myeconfargs+=(
-			--disable-qt6
-			$(use_enable kde kf5)
-			$(use_enable kde qt5)
-		)
-	fi
+	use qt5 && myeconfargs+=( $(use_enable kde kf5) )
+	use qt6 && myeconfargs+=( $(use_enable kde kf6) )
 
 	if use eds || use gtk; then
 		myeconfargs+=( --enable-dconf --enable-gio )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6e84f6de9008..dd6d14b2c12d 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -91,12 +91,13 @@ unset ADDONS_SRC
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 
 IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	base? ( java )
 	bluetooth? ( dbus )
+	kde? ( || ( qt5 qt6 ) )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
@@ -208,11 +209,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		x11-libs/pango
 	)
 	kde? (
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
+		qt5? (
 			kde-frameworks/kconfig:5
 			kde-frameworks/kcoreaddons:5
 			kde-frameworks/ki18n:5
@@ -234,6 +231,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	!mariadb? ( dev-db/mysql-connector-c:= )
 	pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
 	qt6? ( dev-qt/qtbase:6[gui,widgets] )
 "
 # FIXME: cppunit should be moved to test conditional
@@ -467,12 +470,11 @@ src_configure() {
 	export PYTHON_CFLAGS=$(python_get_CFLAGS)
 	export PYTHON_LIBS=$(python_get_LIBS)
 
+	if use qt5; then
+		export QT5DIR="$(qt5_get_bindir)/.."
+	fi
 	if use qt6; then
 		export QT6DIR="$(qt6_get_bindir)/.."
-	else
-		if use kde; then
-			export QT5DIR="$(qt5_get_bindir)/.."
-		fi
 	fi
 
 	local gentoo_buildid="Gentoo official package"
@@ -501,7 +503,7 @@ src_configure() {
 		--enable-build-opensymbol
 		--enable-cairo-canvas
 		--enable-largefile
-		--enable-mergelibs
+		--enable-mergelibs=more
 		--enable-python=system
 		--enable-randr
 		--enable-release-build
@@ -552,6 +554,8 @@ src_configure() {
 		$(use_enable odk)
 		$(use_enable pdfimport)
 		$(use_enable postgres postgresql-sdbc)
+		$(use_enable qt5)
+		$(use_enable qt6)
 		$(use_enable vulkan skia)
 		$(use_with accessibility lxml)
 		$(use_with coinmp system-coinmp)
@@ -562,19 +566,8 @@ src_configure() {
 		$(use_with valgrind)
 	)
 
-	if use qt6; then
-		myeconfargs+=(
-			--disable-qt5
-			$(use_enable qt6 qt6)
-			$(use_enable kde kf6)
-		)
-	else
-		myeconfargs+=(
-			--disable-qt6
-			$(use_enable kde kf5)
-			$(use_enable kde qt5)
-		)
-	fi
+	use qt5 && myeconfargs+=( $(use_enable kde kf5) )
+	use qt6 && myeconfargs+=( $(use_enable kde kf6) )
 
 	if use eds || use gtk; then
 		myeconfargs+=( --enable-dconf --enable-gio )