commit: eec807831a6eee59c8b7865236469c2b3f8fad69
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 19:42:08 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 19:45:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eec80783
app-office/libreoffice-bin: re-enable java for x86
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice-bin/Manifest | 3 +++
app-office/libreoffice-bin/libreoffice-bin-7.5.5.2.ebuild | 11 +++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice-bin/Manifest
b/app-office/libreoffice-bin/Manifest
index 71f0ff3242e4..64a81a8bf021 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -14,5 +14,8 @@ DIST x86-bin-libreoffice-7.5.3.2.tar.xz 150673172 BLAKE2B
90d69a066ac9f7705bd5fd
DIST x86-bin-libreoffice-7.5.5.2.tar.xz 153296004 BLAKE2B
fa14d21a4b47ee6192bfe6a647c08e3886454942494c2abf6eb1e27978634c910c838bee00d0f2fc6e38dc492529192a26498ab5464a73d50e33f74a83f96deb
SHA512
095413d499325425b7d874bcbc437af9bcd558be7cbaeb9716916e1af539256f1ddf705067762dd48bad8edff1637ca1b581b6b3b3e924661357780080bec616
DIST x86-bin-libreoffice-gnome-7.5.3.2.xd3 1749063 BLAKE2B
4cec2c2e7551443850e0a858b0ac7f1d0888f329d8bf402f28bdd15f861ea8c2e8a1fa4c8e0ac01731bc7069c95f89d08f147108fecc219cb470a3e1b66c8b3e
SHA512
f196808233dc18ed42aae0328209876c61b9b556d6ea3ebe87a674e46bff4aab8d1f5ad2f4b0b8e3de05fe0b6aa2c6244dcad677e41d7b510e63d0d032216855
DIST x86-bin-libreoffice-gnome-7.5.5.2.xd3 2257902 BLAKE2B
f09c1f107a7a784250280174efc822dbcb80c69839b475dae05f5f6f1c5b3eb4c96f56e16ba3aafec57d47be904fdc7b7cc14b650ea01e850745a30a8bcbf866
SHA512
9372a87fee0daad90b758e476bf3ae21aeb140199d1057929c7e571f3c5d9c27b5dc25b9cd87a924e2aa8f38e81a774285f8d137779e4207ecccf0d720de4abf
+DIST x86-bin-libreoffice-gnome-java-7.5.5.2.xd3 34136446 BLAKE2B
91c89bb5f8b2881fbb273a858bb8513eb14d01319682ca4c4e5ddebf1c050e162d29eaf6f360334ae380955132c344f13e5d2a72b52957148b9b49e19c671f9e
SHA512
934b7fb73d7c4c24dd1c97acb45130f9b1e2436632c4b1fb9b1c3e1fac4a2f0461bdbab5105de8c139bbbe3a5a2f882ad233144ce0dbd689105d41a3e519e38b
+DIST x86-bin-libreoffice-java-7.5.5.2.xd3 34041428 BLAKE2B
3088d7cd04984d154bb29a81291a1fad2d2c1e6f1683a07304426081e2c73185c48d41e8c08fe0ced8a6f774597e5e2bb591c575a5a5a69a50af51adff2002cf
SHA512
21db2c558aba79d6b2d727f31e73cd4f10a0c626b880e71ce0b09228eb8e481cdb7f6097729ca23788392098e6f4220821414bc718fd4daabeb5ead6d935f704
DIST x86-bin-libreoffice-kde-7.5.3.2.xd3 19989837 BLAKE2B
cc1844c9312b47b397823af3a8860b03ab3690f3e5e38190df6ab5f0a9ce537d961a309aa4ec99fd7ef65a0bf99a505cc8eb414dcc958c73d8b1dde80b543a77
SHA512
b0c1a6906b322831c39c248c816e5b203ed2c5a17dae9cf4e25a0d7361818f2a466860d4e9eeb04132ac797c5d7798a8f3651d97d25a5c64c4c135297f092f4e
DIST x86-bin-libreoffice-kde-7.5.5.2.xd3 23055702 BLAKE2B
7a090b193c0756c1858082fd385a4e72002d59d096ca345e123fba66c5b61e1874c85b6e1991e1f3d53d8f9731b9bdf6735d82570238a1f512a0b96464c16e38
SHA512
9224ea55eeb84c7838d7683c943eee6f88bf2d79cf4ba03e16ba1f4617e0c29fb3af1087077450ba08a9bd8cf13637d2c879f4870d1ea8124f61f8572c1bde96
+DIST x86-bin-libreoffice-kde-java-7.5.5.2.xd3 34708882 BLAKE2B
1156815274e242efe984b8b05cc3aef520cb2f7c7592fdfd101bb8774b3cbace4079770f858bbef1de58ce97e26ead53bd1f06b91be2e75235ef74b66b33f19e
SHA512
ffdcf1e4b65ec25c1867bd4baec68b1b24ceab0bdccda36436ca5a465db92ac7e114f6182e7c47ec63961b3dacfcd16b883099d3613056e333a0a6139a3fff7e
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.5.5.2.ebuild
b/app-office/libreoffice-bin/libreoffice-bin-7.5.5.2.ebuild
index 8d2d46ecdbc1..625dbb168ba5 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-7.5.5.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-7.5.5.2.ebuild
@@ -31,11 +31,16 @@ SRC_URI_AMD64="
SRC_URI_X86="
${BASE_X86_URI}libreoffice-${PVR}.tar.xz
kde? (
- ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
+ !java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
)
gnome? (
- ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
+ !java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
)
+ !kde? ( !gnome? (
+ java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+ ) )
"
SRC_URI="
@@ -211,8 +216,6 @@ src_unpack() {
einfo "Uncompressing distfile
${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
xz -cd
"${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" >
"${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
- use x86 && use java && die "There is no build for x86 with Java
support."
-
local patchname
use kde && patchname="-kde"
use gnome && patchname="-gnome"
