commit: dfeb3e3a147d030668bd57b29238b2a13b23dc1c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 19:44:11 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 19:45:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfeb3e3a
app-office/libreoffice-bin-debug: re-enable java for x86
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice-bin-debug/Manifest | 3 +++
.../libreoffice-bin-debug-7.5.5.2.ebuild | 11 +++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice-bin-debug/Manifest
b/app-office/libreoffice-bin-debug/Manifest
index 296d64bb7663..15ce52fa1661 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -14,5 +14,8 @@ DIST x86-debug-libreoffice-7.5.3.2.tar.xz 8094076 BLAKE2B
46a9a808cdbb58c95a5543
DIST x86-debug-libreoffice-7.5.5.2.tar.xz 8519804 BLAKE2B
490db986be31b60df4435aebb2c499743e9ed7558c8e201b7671d147d2302d3e963ebebb4a9fe91f95e7e5627d45505d9c5d1b3374ce8386519bc4e883f91c5f
SHA512
2c4af7ad2b68b9c18342d3246ff45849057751e3c065f7c912a5a28a90c394982311586554cbbb82292a5140e9a3da5ef99134f274e8392447716db12efd9673
DIST x86-debug-libreoffice-gnome-7.5.3.2.xd3 39572 BLAKE2B
674527dff6fe98c3d9ddecb62d41aba70ddd9013929f41fb7bbf50d1a846938e02b766b97532fddec8d8cc7cd05cd81af308f3ff29483dd7a384c08700fd228d
SHA512
0791892e25c217a6ea6a89ecc66205605c228e142b2ee1dceb70b61a4177a7a23c327165b8bec9a0627c412f6436206c2ba0856df0edae0cd59aae6d9288694f
DIST x86-debug-libreoffice-gnome-7.5.5.2.xd3 45578 BLAKE2B
536cfebd8623b67553563cc8eb32c4bfaffefb06cec77bae10c8642483e6a5c90016fd4c9e209c202800e0946d57cfdace36628c068c56cc933a31a41da7fdcf
SHA512
1136951074f520a65ebf83785806db9c5389402bd2d39566c0fb85f4826ce086c182807ecdecb2e45d58fbb719ede8d1b810efe162c8cb5f881314e08e97073e
+DIST x86-debug-libreoffice-gnome-java-7.5.5.2.xd3 3784457 BLAKE2B
49e81f1eadb08693a7877d58fcd6448ff9cbf58da39f7e43dec061802169ed92638d1cfaa2efd324b58b8a509eaf9721f725a841d8c001139c4b477acaffd4ac
SHA512
b525fe6d29e12ae0f64b388b86d53e11aa28e0b8e0481771aa744dc1b7f8cd2201636068e7d407b54793d09644cbe569501ac4fc4085c165fde52285580296cc
+DIST x86-debug-libreoffice-java-7.5.5.2.xd3 3750727 BLAKE2B
92e51acdcbbd34a58fcad21a81fa7e25cfbc5fc746706e02eced46318c5ff15e6722242fdfce01f9165d2bc758afab7769df2a4034f3a0f83995a26f29e66362
SHA512
f5531d19394e50be22ff9be3d41195c89227401bf0ff42fc81af58745b29572ff1bda82eef0c2787f59fd07c6593e8caf33afbb9fcd7db1889c2ba3ac304fde8
DIST x86-debug-libreoffice-kde-7.5.3.2.xd3 2757424 BLAKE2B
bf17f632bbd5d142ff3ca8dce14bab0775c016dc0d8803735162ac88e71d7ade8013ba7d9f0762a77c2fa0e8110aa10039d8b364e1faf7ff04cb41b47e164223
SHA512
015e224bcf27a7ea7e4493bbfa4bd3cce7756fd85ebe7bb91c73a5ca162701d6c331460ecb88a1ff3523568f3e608af9cac2acba8125e39ba7eff43b9556e89c
DIST x86-debug-libreoffice-kde-7.5.5.2.xd3 2750150 BLAKE2B
96796f8fc56421e24e70a39100e83aabd9be34277b76fde0ec1c78ec106b07614c8463a0f5864868a8f5b25c5a7aa58ea8926c05b888523b1024923db02c7768
SHA512
be9ad35e536c0dcc89ebe5bf7d962f75fe3820f3ab6db09345fed18ded1dc45c038f53b0127d3a7dd5199d3505a23eab0646ea64434a603c07ccdbf2dc55f110
+DIST x86-debug-libreoffice-kde-java-7.5.5.2.xd3 3851437 BLAKE2B
1a692a65320ed537b1f741fed832c6f717b66610cec58d205805cca41a276c9119c1c85b017999a37682387d9856df9bf6a15141d26413379c3471d177cdc029
SHA512
de7eb31b4db72aa81030383553b5dfba66e412b38c754dfffd903a72c7601b6728367af9ac2d2522f8c5c4baa038c828ba66e5cad7f4a820f95dfbbca2e00296
diff --git
a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.5.2.ebuild
b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.5.2.ebuild
index 7c94beeb02c9..f221193d80e3 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.5.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.5.5.2.ebuild
@@ -26,11 +26,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="
@@ -58,8 +63,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"
