gentoo auto-resync : 05:03:2025 - 01:46:50

3 files changed, 28 insertions, 24 deletions

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index e6cb7bf029ce..f58256731953 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -8,6 +8,6 @@ DIST amd64-bin-libreoffice-java-24.2.7.2.xd3 32326596 BLAKE2B 03c48f8a592fdbfd0c
 DIST amd64-bin-libreoffice-kde-24.2.7.2.xd3 21800357 BLAKE2B 99880a908e653ea6e97e0d43ca6d1cf2e249358aac733278ed63a870efbe852a299e27318c6dcf83d7415980f79df64f0d6f8a9fbc60f0956c640c2627555eb5 SHA512 6b5bd27e753d097f7c6e362c381400e6ac5175f9466e6cb0c732f67a0abe045324dd3f72649398892375641da1b5638442c246ebd56930c8c7901415ab604352
 DIST amd64-bin-libreoffice-kde-java-24.2.7.2.xd3 33602855 BLAKE2B d71000157c30d7f94152e26d46ce6c67a595dcaa92092890aa3ae52206860ec1911fceae15e02045344ff9fc4cb28aaad088a877d7699b341bcc25ef948b519f SHA512 2f28ffb4f2c60875be0fe451a4ac177bb413cdff0806a709b8adb5f24e4f4bff4d22a9818d27a297bf8f9674313dbc984b0d8ade364351ca4dc06121baa01b84
 EBUILD libreoffice-bin-24.2.7.2.ebuild 6019 BLAKE2B ec729faa920ceaf8023fc8aff6f720b993b3abd169a1cb78898d70306eb170dbad9203171c353924ccb0e6d19f48508f9b3e65fb65b718b39590711b9a3474c4 SHA512 b5be229047a96121ec6f67716eee58ce07a98e5be5bfb567b845b5eb4bbe286141e760a0d3d8cd5d72bba943a1c76eb535c5a29e62055cf2c7c0f1840cac1d5a
-EBUILD libreoffice-bin-24.8.4-r1.ebuild 3263 BLAKE2B 8e8882314ee55889b2d98e980026292ea16ca0cf57bb306ae3a134cf563161a36bb27d2cf22930d3f4490904f0ef1865626aa83b53ac90a4ca3fc3a38e3d486b SHA512 197f283c195e4dc87cc459bfbe54cbf1e99d9b14468b1afc15bec89ed611f8b19c3949f76a91c8acf25ca87023db8911ea10dee706cdcc68c07ba98a99b1b3c9
-EBUILD libreoffice-bin-25.2.0-r1.ebuild 3264 BLAKE2B 9ebb3ebc3cfec03ed5ff4e028c8b6718b2f242c7d2b179b5e1dcfca0638912d55b01a4bc9d11565f510b4c74e8ec8030b42abb5cc926e2488f4005a1d11d3571 SHA512 7a6612d06a11f9b5991e022d4832f378d347104343eaf81dd80aa2d605243f85009b30c442cfd27418d367ba6cb976ffcf16506d090e4f08d941fb272e6ee95f
+EBUILD libreoffice-bin-24.8.4-r2.ebuild 3410 BLAKE2B d069b6d1f5ea48dffe79321110189954105ce4fb5d4da853366fa87de98f314460f785bdf001b2034a4b32a367d42bfdd8bb81265cb7e19fbb3b24eb69e55a8c SHA512 f4ed751dad6ffd1b06b1e9d0f9943f4c13ff873fc6a3a73c4845d031db810ef6bd967d3c8ecc6918633e5b2aa01ed5b2230c482b59e7a20d03aacbdd4888b52c
+EBUILD libreoffice-bin-25.2.0-r2.ebuild 3411 BLAKE2B b28938c6f1046a1e1a94a137682255a0d549d6d05c625f110e85fc2f21683610e66c432d57a273baf7faa87c3c25a887115aafc472b6b8709a59f466fe171c4d SHA512 c479958d78e75f906332ab59bd1706fdcfff29fa8fc82d8db0bdd432e4bf6d1442a67ebebfdeb9dc763a07b803c5b4e5744964d92996f4b6bcd0b96ed90cd08d
 MISC metadata.xml 529 BLAKE2B a789c063d4ee905fd36dd0192d0f2769e0eeff96e69b9f27a2e75ca47a7bcb0ec841e68cd0d5299152df2b9b626bcf301066aa251e1b4ca2b74290d57c448c8e SHA512 b98d77cf995e824efcc392c185e616219d35976f43c343a1cfb1737fb44556edbd47b13d47924e3195159d0ec06e40f4909d0e7cd9deed7a8fa10928bc47becf
diff --git a/app-office/libreoffice-bin/libreoffice-bin-24.8.4-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-24.8.4-r2.ebuild
index 61903e5b025c..0aeeff6455c0 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-24.8.4-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-24.8.4-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="-* amd64"
-IUSE="java gnome python"
+IUSE="java python"
 
 RDEPEND="
 	acct-group/libreoffice
@@ -62,14 +62,12 @@ RDEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/pango
-	gnome? (
-		dev-libs/glib:2
-		>=gnome-base/dconf-0.40.0
-		gnome-extra/evolution-data-server
-	)
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
 	java? ( virtual/jre:11 )
 "
+PDEPEND="
+	=app-office/libreoffice-l10n-$(ver_cut 1-2)*
+"
 RESTRICT="test strip"
 
 QA_PREBUILT="opt/* usr/*"
@@ -84,11 +82,15 @@ src_unpack() {
 	# We don't package Firebird anymore
 	rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-firebird*_amd64.deb || die
 
-	if ! use gnome ; then
-		rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-gnome-integration*_amd64.deb || die
-	fi
-
-	# Requires KF5 as of 25.2.0, so we choose not to use it.
+	# The GNOME and KDE integration .debs are a mix of both:
+	# 1) VCLs (GUI backends), and
+	# 2) Actual DE integration (which needs KF5 and so on)
+	#
+	# For now, we always install the GTK one, and don't install the Qt
+	# one (as it's Qt5-based).
+	#
+	# KDE integration itself also requires KF5 as of 25.2.0, so we choose not to use it.
+	# Can revisit when it's KF6-based.
 	rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-kde-integration*_amd64.deb || die
 
 	# Bundled Python is used (3.10 as of 25.2.0), so no need for system dependency.
diff --git a/app-office/libreoffice-bin/libreoffice-bin-25.2.0-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-25.2.0-r2.ebuild
index 9a415e0207c1..3c8e4713c727 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-25.2.0-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-25.2.0-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="java gnome python"
+IUSE="java python"
 
 RDEPEND="
 	acct-group/libreoffice
@@ -62,14 +62,12 @@ RDEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/pango
-	gnome? (
-		dev-libs/glib:2
-		>=gnome-base/dconf-0.40.0
-		gnome-extra/evolution-data-server
-	)
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
 	java? ( virtual/jre:11 )
 "
+PDEPEND="
+	=app-office/libreoffice-l10n-$(ver_cut 1-2)*
+"
 RESTRICT="test strip"
 
 QA_PREBUILT="opt/* usr/*"
@@ -84,11 +82,15 @@ src_unpack() {
 	# We don't package Firebird anymore
 	rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-firebird*_amd64.deb || die
 
-	if ! use gnome ; then
-		rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-gnome-integration*_amd64.deb || die
-	fi
-
-	# Requires KF5 as of 25.2.0, so we choose not to use it.
+	# The GNOME and KDE integration .debs are a mix of both:
+	# 1) VCLs (GUI backends), and
+	# 2) Actual DE integration (which needs KF5 and so on)
+	#
+	# For now, we always install the GTK one, and don't install the Qt
+	# one (as it's Qt5-based).
+	#
+	# KDE integration itself also requires KF5 as of 25.2.0, so we choose not to use it.
+	# Can revisit when it's KF6-based.
 	rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-kde-integration*_amd64.deb || die
 
 	# Bundled Python is used (3.10 as of 25.2.0), so no need for system dependency.