commit: 6e453c17dd4bac55a905e179f04d9693f6c5f830
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 8 23:22:22 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Feb 8 23:23:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e453c17
app-office/libreoffice: Untested bump, work in progress
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 ++
.../{libreoffice-9999.ebuild => libreoffice-7.3.0.3.ebuild} | 13 +++++++++----
...{libreoffice-9999.ebuild => libreoffice-7.3.9999.ebuild} | 9 +++++++--
app-office/libreoffice/libreoffice-9999.ebuild | 9 +++++++--
4 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e7d46b30b74a..96a07bf396a1 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,9 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
211919 BLAKE2B 2c7
DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B
7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3
SHA512
295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B
836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590
SHA512
4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
DIST libreoffice-7.2.5.2.tar.xz 252977224 BLAKE2B
c8221824ed4747ad7fd9534c6c3d612fa711f78b382587345c5a5604a263b7697fb03c77c1927343052ebcd0aa8db2d693208599137bc8884eeb1bf408951463
SHA512
a84682597e10fabb8c1605b785510fa5fe861f3056f61bd01513e1de6ebdb8a343d254af063cd977e4379348ad28d8a457989b3d42014f1c18d5d85626f6dfe8
+DIST libreoffice-7.3.0.3.tar.xz 254873208 BLAKE2B
08eff5890ca882e3aad688575f3114d461922c497c3397a5ff24c331d74564d0fe2d39e0bf195cd4bc2beadb63ca19914433cf5119990c54ae895cdd89059120
SHA512
408b98184afc0721f922768f60e877fd756b656b4fd30cf6ad629bd32ba323fb1f4b052c8427b11395253b4ed67f9a1fd20ef3f7fd5945abc0f8cfb1f40c5d47
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B
f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883
SHA512
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.2.5.2.tar.xz 112080572 BLAKE2B
9c07cec6cd6c639335c38af65f3dccf331200422f670fa225e355117062f5ad2a8173c5f59ee63137aa480e8db307b0671e4a7a0ff503ea3a034e126e0464120
SHA512
70ffcb1a96637dabd9a658151d2b88a92dd8a89cd396609339ec5470b93fbc2ae589a434b4f09d22fc8ad515369a646dd8040c33e6a91977dd7158f57cd48e00
+DIST libreoffice-help-7.3.0.3.tar.xz 112208912 BLAKE2B
445c0923296010fbbe9a6409596e8bf453ced7989d0a82989f5eb70fcc167039a72783aa85d6c7587e9cba07def80ca5a9e1af450039f7ddaae6233021530c7e
SHA512
6d6fb4968ce7b40291c9426183d2d031761e5d3421d66adda0b0e1cf57c1aeb68252cec561119935c68b6239add8ba7ee686ce6365ce84cc2ce4f85346fe2aec
DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B
a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7
SHA512
625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B
2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3
SHA512
fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild
b/app-office/libreoffice/libreoffice-7.3.0.3.ebuild
similarity index 98%
copy from app-office/libreoffice/libreoffice-9999.ebuild
copy to app-office/libreoffice/libreoffice-7.3.0.3.ebuild
index 41971fab4eeb..378ef7d794de 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -104,8 +104,8 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -128,6 +128,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/libwpg:0.3
>=app-text/libwps-0.4
app-text/mythes
+ dev-cpp/abseil-cpp:=
>=dev-cpp/clucene-2.3.3.4-r2
>=dev-cpp/libcmis-0.5.2
dev-db/unixODBC
@@ -138,7 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- dev-libs/liborcus:0/0.17
+ >=dev-libs/liborcus-0.17.2:0/0.17
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
@@ -160,6 +161,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
media-libs/libzmf
+ media-libs/openjpeg:=
media-libs/zxing-cpp
>=net-libs/neon-0.31.1:=
net-misc/curl
@@ -488,6 +490,7 @@ src_configure() {
--disable-online-update
--disable-openssl
--disable-pdfium
+ --disable-qt6
--with-extra-buildid="${gentoo_buildid}"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
@@ -496,6 +499,8 @@ src_configure() {
--with-external-tar="${DISTDIR}"
--with-lang=""
--with-parallelism=$(makeopts_jobs)
+ --with-system-abseil
+ --with-system-openjpeg
--with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild
b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-9999.ebuild
copy to app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 41971fab4eeb..0a6cb0608a09 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -128,6 +128,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/libwpg:0.3
>=app-text/libwps-0.4
app-text/mythes
+ dev-cpp/abseil-cpp:=
>=dev-cpp/clucene-2.3.3.4-r2
>=dev-cpp/libcmis-0.5.2
dev-db/unixODBC
@@ -138,7 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- dev-libs/liborcus:0/0.17
+ >=dev-libs/liborcus-0.17.2:0/0.17
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
@@ -160,6 +161,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
media-libs/libzmf
+ media-libs/openjpeg:=
media-libs/zxing-cpp
>=net-libs/neon-0.31.1:=
net-misc/curl
@@ -488,6 +490,7 @@ src_configure() {
--disable-online-update
--disable-openssl
--disable-pdfium
+ --disable-qt6
--with-extra-buildid="${gentoo_buildid}"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
@@ -496,6 +499,8 @@ src_configure() {
--with-external-tar="${DISTDIR}"
--with-lang=""
--with-parallelism=$(makeopts_jobs)
+ --with-system-abseil
+ --with-system-openjpeg
--with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild
b/app-office/libreoffice/libreoffice-9999.ebuild
index 41971fab4eeb..0a6cb0608a09 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -128,6 +128,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/libwpg:0.3
>=app-text/libwps-0.4
app-text/mythes
+ dev-cpp/abseil-cpp:=
>=dev-cpp/clucene-2.3.3.4-r2
>=dev-cpp/libcmis-0.5.2
dev-db/unixODBC
@@ -138,7 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- dev-libs/liborcus:0/0.17
+ >=dev-libs/liborcus-0.17.2:0/0.17
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
@@ -160,6 +161,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
media-libs/libzmf
+ media-libs/openjpeg:=
media-libs/zxing-cpp
>=net-libs/neon-0.31.1:=
net-misc/curl
@@ -488,6 +490,7 @@ src_configure() {
--disable-online-update
--disable-openssl
--disable-pdfium
+ --disable-qt6
--with-extra-buildid="${gentoo_buildid}"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
@@ -496,6 +499,8 @@ src_configure() {
--with-external-tar="${DISTDIR}"
--with-lang=""
--with-parallelism=$(makeopts_jobs)
+ --with-system-abseil
+ --with-system-openjpeg
--with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
